On Mon, Aug 22, 2011 at 12:56 PM, Hyrum K Wright
<hyrum.wright_at_wandisco.com> wrote:
> On Mon, Aug 22, 2011 at 12:00 PM, Stefan Sperling <stsp_at_elego.de> wrote:
>> On Mon, Aug 22, 2011 at 11:52:06AM -0500, Hyrum K Wright wrote:
>>> Thank you for introducing subtree mergeinfo onto CHANGES. :(
>>
>> I didn't do it! svn did!
>>
>> Jokes aside, there is subtree mergeinfo in CHANGES on 1.6.x.
>> I don't recall this being a problem. What exactly are you worried about?
>
> But there wasn't any yet on 1.7.x. :) (I did the prior merges to the
> branch root, rather than directly on CHANGES.)
>
> 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.
For the record, my recent merges to 1.7.x haven't updated any
mergeinfo on CHANGES, so my concerns are unfounded.
-Hyrum
--
uberSVN: Apache Subversion Made Easy
http://www.uberSVN.com/
Received on 2011-08-23 16:48:23 CEST