[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r1160330 - /subversion/branches/1.7.x/CHANGES

From: Hyrum K Wright <hyrum.wright_at_wandisco.com>
Date: Mon, 22 Aug 2011 12:56:27 -0500

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.

-Hyrum

-- 
uberSVN: Apache Subversion Made Easy
http://www.uberSVN.com/
Received on 2011-08-22 19:56:58 CEST

This is an archived mail posted to the Subversion Dev mailing list.