On Wed, Mar 15, 2017 at 11:09 AM, mark gross <mark97...@gmail.com> wrote: > I recently noticed that the common.git/android-4.9 branch has started a new > (as of the v4.9.13 merge) way of doing merges from linux stable. > > I must say that it hurts my eyes to look at that history as compared with > nice clean merges of tagged dot releases from linux stable. (e.g. v4.9.13 > looks much nicer to me than what has happened after the v4.9.13 merge.)
Yea, I hadn't notice that myself. It is interesting to look at in tig. > What is the benefit of making the tree hard to comprehend? > > Sure, merge conflicts are better isolated to specific changes this way but, > damn its ugly. My guess, as the merges are seemingly done by a bot, is that by doing a merge on each change, they can more easily validate each -stable patch being added. I wonder if it might also make bisection easier, as you likely won't end up on a branch missing the common.git bits. But it does cause a lot of merge noise. I wonder if such iterative auto-merge testing could be done in a separate private branch and once done a more standard cumulative merge be done on the main branch. But there may be other constraints I'm not aware of. thanks -john -- -- unsubscribe: android-kernel+unsubscr...@googlegroups.com website: http://groups.google.com/group/android-kernel --- You received this message because you are subscribed to the Google Groups "Android Linux Kernel Development" group. To unsubscribe from this group and stop receiving emails from it, send an email to android-kernel+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
