[Svnmerge] svnmerge.py + merge tracking

[Dustin J. Mitchell]

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.

Dustin

-- 
Storage Software Engineer
http://www.zmanda.com