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

Re: reintegrate in 1.8.1

From: Mark Phippard <markphip_at_gmail.com>
Date: Tue, 27 Aug 2013 16:39:20 -0400

On Tue, Aug 27, 2013 at 4:34 PM, Jacob Weber <jacob_at_jacobweber.com> wrote:

> According to the SVN 1.8 release notes: "Merging to-and-fro between two
> branches in any order is possible using the automatic reintegration merge
> (the "keep-alive dance" is no longer necessary)."
>
> So say I merge from a branch into trunk (i.e. what used to be a
> reintegrate), creating revision X. Does this mean I no longer need to run a
> --record-only merge to block X from being merged back into my branch?

Correct. You no longer need to do this.

> The next time I merge from trunk into my branch, how will SVN know not to
> merge X?

Magic :)

Internally, the code still does reintegrate. It just figures out when it
needs to do it. It turns out you could have always avoided doing
--record-only, but only if you "knew" to use --reintegrate on that first
merge from trunk back to the branch. SVN figures this out and is doing it
for you.

If you are merging between branchA and branchB, if the last merge between
those two branches went in the "same direction" it does a sync merge, if it
went in the "opposite direction" it does a reintegrate merge.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
Received on 2013-08-27 22:39:50 CEST

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