On Mon, Aug 22, 2011 at 12:56:27PM -0500, Hyrum K Wright wrote: > For 1.6.x, answering the question "when did we last merge stuff to > CHANGES?" was very difficult, since the subtree mergeinfo was touched > by all the subsequent bugfix merges to the branch. Not a showstopper, > of course, but a bit inconvenient (and the reason I started working on > the ignore-mergeinfo problem a while back). > > But if 1.7 solves the problem, and that's what I use for merging, I've > no complaints.
Yes, a 1.7 client shouldn't update mergeinfo on CHANGES when we merge bug fixes (unless those merges fix bugs in CHANGES :)