* devel branches in rt-tests
@ 2019-12-12 7:52 Uwe Kleine-König
2019-12-13 16:01 ` John Kacur
0 siblings, 1 reply; 2+ messages in thread
From: Uwe Kleine-König @ 2019-12-12 7:52 UTC (permalink / raw)
To: John Kacur; +Cc: Clark Williams, linux-rt-users
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
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | https://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: devel branches in rt-tests
2019-12-12 7:52 devel branches in rt-tests Uwe Kleine-König
@ 2019-12-13 16:01 ` John Kacur
0 siblings, 0 replies; 2+ messages in thread
From: John Kacur @ 2019-12-13 16:01 UTC (permalink / raw)
To: Uwe Kleine-König; +Cc: Clark Williams, linux-rt-users
[-- 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-12-13 20:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-12 7:52 devel branches in rt-tests Uwe Kleine-König
2019-12-13 16:01 ` John Kacur
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox