Stefano Lattarini skrev 2012-03-07 22:20: > On 03/07/2012 09:16 PM, Peter Rosin wrote: >> Stefano Lattarini skrev 2012-03-07 20:55: >>> On 03/07/2012 08:32 PM, Peter Rosin wrote: >>> >>>> currently needs to be made on the non-obvious msvc branch instead >>>> of on the more natural maint branch. >>>> >>> "instead of on" sounds a little forced to me (but I'm not a native, so >>> this might be a wrong impression); what about s/instead of/rather than/? >> >> I did s/instead of/and not/ instead. That seemed even clearer... >> >> So, this is what I ended up doing, and thanks for looking! >> > Thanks for finally having cleaned up this mess (which was mostly my fault).
Well, to be honest, I didn't really see it coming either. And I didn't see a clean "solution" until recently. But I do like the fact that doing a bisection between two points on master as well as two points on branch-1.11 should be working. It's going from maint to the other two that can be confusing with two different paths through the graph. So, not too bad. > I've pushed the minor fixlet below to maint, merged maint back into master > and branch-1.11, deleted the now-obsolete 'msvc' branch, and pushed. Right, I saw that too after pushing, but figured noone would care about the ChangeLog on maint. But thanks for cleaning that up... > Let's hope we're out of this merging swamp now :-) Indeed, but that reminds me, did we forget any other branches that should have gotten the same treatment? E.g. yacc-work seems to merge maint once in a while, so it might be good to fake the history (well, not really faking it, but almost) and do: git checkout yacc-work git branch -f maint 94d56e80384e3ae80e2817aa12adae8ad7f3d1ed # before msvc->maint merge git merge --log maint git branch -f maint 3a8146089834c5187d0b0795b9fa71a0f9bba132 # after msvc->maint merge git merge --strategy=ours maint git branch -f maint remotes/origin/maint before someone forgets all about this (I sure would like to forget about it) and merges maint as is. What do you think? Perhaps end with another "git merge --log maint" to pick up the latest stuff while at it. Any other branches that might merge maint? Maybe merge yacc-work into yl-work-for-master and ylwrap-refactor after the above just to make sure they don't merge maint directly at some point in the future? Cheers, Peter
