Thanks for the explanation! I, too, am very confused by this naming scheme. This is even worse with Marshmallow, where there are both "mr" and "dr" release branches, but no obvious connection to the build tags. I have no idea what "dr" even stands for...and it isn't obvious what the differences are due to all the cherry-picking.
If someone can provide more info on understanding and working with the AOSP branches, that would be great. - On Saturday, August 22, 2015 at 11:48:49 AM UTC-4, Timduru Meerkat wrote: > > _r6, _r12 and _r13 are in different branches. > You currently have 3 main parallel branches for LP: > > - lollipop-mr1-release > > <https://android.googlesource.com/platform/frameworks/base/+/lollipop-mr1-release> > - tags: android-5.1.1_r4 > > <https://android.googlesource.com/platform/frameworks/base/+/refs/tags/android-5.1.1_r4> > android-5.1.1_r6 > > <https://android.googlesource.com/platform/frameworks/base/+/refs/tags/android-5.1.1_r6> > android-5.1.1_r9 > > <https://android.googlesource.com/platform/frameworks/base/+/refs/tags/android-5.1.1_r9> > android-5.1.1_r10 > > <https://android.googlesource.com/platform/frameworks/base/+/refs/tags/android-5.1.1_r10> > - lollipop-mr1-fi-release > > <https://android.googlesource.com/platform/frameworks/base/+/lollipop-mr1-fi-release> > - tags: android-5.1.1_r4 > > <https://android.googlesource.com/platform/frameworks/base/+/refs/tags/android-5.1.1_r4> > android-5.1.1_r8 > > <https://android.googlesource.com/platform/frameworks/base/+/refs/tags/android-5.1.1_r8> > android-5.1.1_r13 > > <https://android.googlesource.com/platform/frameworks/base/+/refs/tags/android-5.1.1_r13> > - lollipop-mr1-wfc-release > > <https://android.googlesource.com/platform/frameworks/base/+/lollipop-mr1-wfc-release> > - > tags: lollipop-mr1-dev > > <https://android.googlesource.com/platform/frameworks/base/+/refs/heads/lollipop-mr1-dev> > android-5.1.1_r5 > > <https://android.googlesource.com/platform/frameworks/base/+/refs/tags/android-5.1.1_r5> > android-5.1.1_r12 > > <https://android.googlesource.com/platform/frameworks/base/+/refs/tags/android-5.1.1_r12> > > > The wfc branch was forked a long time ago, and it's older, hence why it'll > report many changes. when you compared from r12 to r13 > It might also have gotten a bunch of cp, with commit ids changed it seems > > > But basically if you're currently at _r6 (mr1-release ) you should switch > to the _r10 not _r13 > > It's very confusing, not sure why the tags are not named accordingly with > their respective branches like add a suffix -wfc -fi > it would make it easier to identify. > > > On Monday, August 17, 2015 at 4:29:28 AM UTC+2, Shawn Teoh wrote: >> >> Greetings, so I have been trying to compare the difference between the >> different tags using git log, and I observed a strange behavior. >> >> For instance, >> git log --no-merges --oneline android-5.1.1_r6..android-5.1.1_r13 | cat | >> wc -l >> returns 33, but >> git log --no-merges --oneline android-5.1.1_r12..android-5.1.1_r13 | cat >> | wc -l >> returns a huge 285 instead. >> >> Logically thinking, since r6 to r13 has a bigger gap, it should have more >> changes, but in this case r12 to r13 seem to have more changes. Can anyone >> please kindly enlighten me? Thank you. >> > -- -- You received this message because you are subscribed to the "Android Building" mailing list. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/android-building?hl=en --- You received this message because you are subscribed to the Google Groups "Android Building" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
