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

Re: First time use of merge reintegrate

From: Rohan Joseph <rohanjoseph_at_gmail.com>
Date: Mon, 18 Aug 2008 22:51:01 -0500

Thanks! My understanding of using --reintegrate is that it is used so
as to avoid merging in changes on a branch, that came from the trunk,
back to the trunk.

Let's say that a user branches off the trunk, does some development and then

1. Syncs up with the trunk by merging from the trunk to the branch.
Makes sure everything works and commits* the change to his branch.

Now while syncing back to the trunk, he should use the --reintegrate
switch. But if he instead, checked out the trunk, and blocked the last
commit on the branch out by doing this

svn merge -r N-1:N --record-only URL-TO-BRANCH

where N is the revision number in which he committed the changes from
step (1) [corresponds to * in step 1].

Then instead of using the --reintegrate switch, he or she simply runs
the merge command. Wouldn't it do the right thing and avoid a cyclical
merge scenario? Or am I missing something here?

On Mon, Aug 18, 2008 at 2:26 PM, Mark Phippard <markphip_at_gmail.com> wrote:
> On Mon, Aug 18, 2008 at 3:14 PM, Rohan Joseph <rohanjoseph_at_gmail.com> wrote:
>> Thanks Mark. That makes sense. The merge-syntax you provided is
>> correct and - the merge worked! Why did this merge work, and why did
>> the merge with the --reintegrate command fail?
> The command did not fail, it flagged a conflict as it should have. I
> am not familiar with the internals of how SVN's merge algorithm works,
> but I have also observed it not creating conflicts in times where I
> thought it might. Granted, not on the same merge command though.
> --
> Thanks
> Mark Phippard
> http://markphip.blogspot.com/

Best Regards,
Rohan Joseph
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-08-19 15:57:23 CEST

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.