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

reintegrate in 1.8.1

From: Jacob Weber <jacob_at_jacobweber.com>
Date: Tue, 27 Aug 2013 13:34:22 -0700

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? The next time I merge from trunk into my branch, how will SVN know not to merge X?

Thanks,
Jacob
Received on 2013-08-27 22:34:58 CEST

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