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

Reply via email to