[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: Reid Priedhorsky <reid_at_umn.edu>
Date: Tue, 24 Feb 2009 19:23:35 -0600

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?

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?

Thanks,

Reid

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-25 02:24:26 CET

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