From: John Kacur <jkacur@redhat.com>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Cc: Clark Williams <williams@redhat.com>, linux-rt-users@vger.kernel.org
Subject: Re: devel branches in rt-tests
Date: Fri, 13 Dec 2019 17:01:43 +0100 (CET) [thread overview]
Message-ID: <alpine.LFD.2.21.1912131659310.7507@planxty> (raw)
In-Reply-To: <20191212075250.7yc36dghunlw4t6t@pengutronix.de>
[-- Attachment #1: Type: text/plain, Size: 1202 bytes --]
On Thu, 12 Dec 2019, Uwe Kleine-König wrote:
> Hello John,
>
> I wonder about the two branches
>
> unstable/devel/latest (at 07a73b6ecf748c424c676f1ba8030ca678360e0e)
> unstable/devel/latest-devel (at c5aa9a877b146846da21e5d63597a2a09a3c96d7)
>
> in the rt-tests.git repository.
>
> According to
>
> git range-diff origin/unstable/devel/latest...origin/unstable/devel/latest-devel
>
> the two contain mostly identical commits. It seems to me
> unstable/devel/latest is a rebased version of
> unstable/devel/latest-devel as the commit dates are newer and two
> patches that are duplicated in .../latest-devel[1] only occur once each in
> .../latest. Also .../latest has 5 more commits.
>
> Does that mean unstable/devel/latest-devel is the one to ignore?
>
> Best regards
> Uwe
>
> [1] git range-diff 97632deddf783249e0e3d34630792c7696b7d5d5...90449d993fc9973381f1c37fbda37c39a43ab503
>
> --
My original intention was to do development in the devel branch, and
update latest for new releases. I think that people have found this
confusing though, so I'm thinking of doing away with the latest-devel
branch. You are correct that latest is currently more up to date than
latest-devel
prev parent reply other threads:[~2019-12-13 20:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-12 7:52 devel branches in rt-tests Uwe Kleine-König
2019-12-13 16:01 ` John Kacur [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.LFD.2.21.1912131659310.7507@planxty \
--to=jkacur@redhat.com \
--cc=linux-rt-users@vger.kernel.org \
--cc=u.kleine-koenig@pengutronix.de \
--cc=williams@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).