[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: Mark Phippard <markphip_at_gmail.com>
Date: Tue, 24 Feb 2009 20:37:54 -0500

On Tue, Feb 24, 2009 at 8:23 PM, Reid Priedhorsky <reid_at_umn.edu> wrote:
> On 02/24/2009 06:25 PM, Mike Dixon wrote:
>> From the book
>> (http://svnbook.red-bean.com/en/1.5/svn.branchmerge.basicmerging.html):
>>
>> "By specifying the --reintegrate option, you're asking Subversion to
>> carefully replicate only those changes unique to your branch. (And in
>> fact, it does this by comparing the latest trunk tree with the latest
>> branch tree: the resulting difference is exactly your branch changes!)"
>
> Hmm, OK. So, svn merge --reintegrate will not work correctly when the
> trunk has never been merged to the branch, or when the latest version of
> the trunk merged to the branch is not the current version of the trunk.
>
> Shouldn't svnmerge --reintegrate detect these conditions and error out,
> rather than silently doing (potentially) the wrong thing?

Neither of those are true. If you have never done a merge it would
use the revision of trunk you made the branch from, else it does the
last revision from trunk you have merged. It does not have to be
HEAD, However, if it is not HEAD, then it is still possible to get
conflicts you will need to resolve. If it is HEAD, the merge would
typically not have conflicts.

> Or am I still missing something? Why would I want to apply the diff
> between current trunk and current branch to the branch unless the branch
> is fully up to date with respece to the trunk?

You wouldn't, and it doesn't. I cannot explain the problem you have.
Produce a reproduction script if you can and submit it.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1223866
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-25 02:39:18 CET

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