On Thursday 25 September 2014 10:40:46 Stephen Warren wrote: > > I don't recall the exact commits, but I ended up needing to base one of > the branches on -rc2. So, I then based all the branches on the same > commit. When I create Tegra's for-next, I start with that baseline > branch and merge in each Tegra topic branch. That way, the merges only > bring in exactly what's in that branch, and it's easy to validate the > final result in gitk/similar. I see. For us it's actually more helpful if every single topic branch is on the oldest possible state. > I suppose it'd work fine if I start with > the newest base of any branch and then merged the topic branches in; > that would at least restrict the merges to only the contents of the > branch, although it'd create a far more difficult to validate history, > since the different topic branches would be based in different places. Yes, I fear there is no perfect solution to this. Someone also suggested switching around the parent commits during a merge that updates one of our branches to a newer base. That would solve the backmerge problem but in turn break 'git log --first-parent'. Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
