subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Mark Phippard <markp...@gmail.com>
Subject Re: --reintegrate technical documentation?
Date Fri, 05 Feb 2010 16:19:09 GMT
On Fri, Feb 5, 2010 at 11:06 AM, Todd, David <dtodd@irobot.com> wrote:
> I'm looking for a pointer to a technical explanation of what happens when
> one uses --reintegrate.
>
> A number of my users are of the opinion that it's a fragile mode, due to it
> complaining about missing ranges in merginfo. It's making it hard to sell
> use of that facility.

The command is explained here:

http://blogs.open.collab.net/svn/2008/07/subversion-merg.html

There is nothing fragile about it.  It is ultimately just a normal SVN
merge command that has existed since 1.0.  The --reintegrate option
simplifies the syntax you need to provide and more importantly it does
a bunch of checks before starting the merge to prevent problems.  As
of the latest 1.5.x and 1.6.x releases those checks are all solid.  In
older 1.5.x releases they did have some false positives that would
prevent the command from running.  But now the warnings it reports are
all legitimate.

-- 
Thanks

Mark Phippard
http://markphip.blogspot.com/

Mime
View raw message