[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: Ruslan Sivak <russ_at_vshift.com>
Date: Wed, 04 Mar 2009 18:02:28 -0500

Stefan,

I'm not sure you've read my post fully. I might've merged changes both
ways, although I'm not 100% sure that I merged anything back to the
trunk yet. Stefan Sperling 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.
>
>
I don't this is true.
>> 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
>
> Stefan
>

If you read the rest of my post, you will see that the problem is not
caused by any merges that were done, but by a directory that was copied
from the branch to the trunk using OS copy tools. This then caused a
conflict which subversion resolved by itself, but put in wrong
svn:mergeinfo values.

Russ

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1269066

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-03-05 00:03:38 CET

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