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

Re: [Svnmerge] svnmerge.py + merge tracking

From: Dustin J. Mitchell <dustin_at_zmanda.com>
Date: Sat, 10 May 2008 13:38:15 -0400

On Sat, May 10, 2008 at 1:26 PM, Blair Zajac <blair_at_orcaware.com> wrote:
> C. Michael Pilato wrote:
>> I'm a little concerned that, now that Subversion has merge tracking,
>> svnmerge.py is going to stop working for folks. A fix *could* be as
>> easy as having that program pass --ignore-ancestry to its 'merge' calls,
>> but I'm not sure that's how we want to do things. Ideas, anyone?
> cc'ing the svnmerge mailing for input.

To my mind, here are the important points:
 - svnmerge must continue to work with *old* clients and *new*
servers. If this means adding --ignore-ancestry now, then great!
 - svnmerge should continue to work with new clients and new servers,
to allow a transition period for upgrading sites
 - there should be a clear migration path from svnmerge to subversion
merge tracking -- presumably a one-time script that makes changes in
the repo.


Storage Software Engineer
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-05-11 09:09:44 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.