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

Re: --reintegrate technical documentation?

From: Mark Phippard <markphip_at_gmail.com>
Date: Fri, 5 Feb 2010 11:19:09 -0500

On Fri, Feb 5, 2010 at 11:06 AM, Todd, David <dtodd_at_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:


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.

Mark Phippard
Received on 2010-02-05 17:19:45 CET

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

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