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

RE: svn merge --reintegrate confusion

From: Bob Archer <bob.archer_at_amsi.com>
Date: Tue, 24 Feb 2009 17:52:37 -0500

In order to use --reintegrate you have to first merge trunk into branch
If you don't you will see problems... probably like you are seeing.

BOb

> I'm looking for some clarification of the behavior of the "svn merge

--
> reintegrate" command in 1.5. The motivation is, I recently used this
> command to merge a branch into the trunk and, to my dismay, some files
> were changed back to old versions.
> 
> Here are a couple of models for how svn merge --reintegrate works,
> assuming that the command is executed in a trunk working directory.
> 
> Behavior 1: svn merge --reintegrate computes the diff between the most
> recent version of the trunk which was merged into Branch A and the
current
> version of Branch A, and applies that to the working directory.
> 
> Behavior 2: svn merge --reintegrate $svnroot/branches/A computes the
diff
> between the current version of the trunk and the current version of
Branch
> A and applies that to the working directory.
> 
> I had thought that Behavior 1 was correct, but now I'm not sure. Which
is
> correct? Or is it something else?
> 
> Many thanks in advance,
> 
> Reid
> 
> ------------------------------------------------------
>
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageI
d=
> 1223042
> 
> To unsubscribe from this discussion, e-mail: [users-
> unsubscribe_at_subversion.tigris.org].
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1223083
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-24 23:53:28 CET

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