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

Re: reintegrate problem

From: Mark Phippard <markphip_at_gmail.com>
Date: Wed, 4 Mar 2009 18:06:53 -0500

On Wed, Mar 4, 2009 at 5:46 PM, Stefan Sperling <stsp_at_elego.de> wrote:
> On Wed, Mar 04, 2009 at 05:27:15PM -0500, Ruslan Sivak wrote:
>> I think I've found another 1.5 bug related to reintegrate...
>> Some time ago we created a branch called v2.  There were a lot of
>> changes done to this branch, with some merged back to trunk and some
>> changes merged to the branch from trunk. So far so good.
> So you've merged changes both ways.
> You cannot use --reintegrate anymore.
>> Now I would like to fully catch up to the trunk.  I follow the
>> instructions here:  http://blog.red-bean.com/sussman/?p=92
> These instructions only merge changes one way before reintegrating.
> The problem you are seeing is not a bug.
> It's a problem enforced by Subversion's design, and is explained here:
> http://blogs.open.collab.net/svn/2008/07/subversion-merg.html

It is not so black and white to just say it is not supported. It is
actually merge, without --reintegrate, that you cannot really use once
you get into bidirectional merges. I think there might be enough of a
"recipe" here to see if we can recreate it in a test and possibly
enhance the detection process.

--reintegrate is just trying to prevent problems. It detects a
difference that it does not think should be there. In this case, that
detection was a false positive. Maybe we an enhance it. The example
given shows how much better is has already gotten in that it gave a
very intelligible error that allowed Ruslan to figure out why it was
complaining and pinpoint the reason.

I'd use the --record-only option to record the revision that it thinks
is missing.

Mark Phippard
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-03-05 00:07:43 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.