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

[Svnmerge] Merging blocked revisions between branches

From: David James <djames_at_collab.net>
Date: 2006-03-21 23:59:25 CET

Currently, svnmerge.py is not consistent about whether blocked
revisions are merged between branches. Currently, blocked revisions
are sometimes merged between branches, but we silently ignore the
merge if any conflicts arise. I'd like to setup more consistent
behavior.

Here's two options, both of which would be consistent:
1) Never merge 'blocked revisions' between branches. If you ask
svnmerge.py to not merge r10 from branchA to branchB, and then merge
changes from branchB to branchC, you've only asked svnmerge to block a
merge of r10 from branchA to branchB. r10 is still available to merge
from branchA to branchC.
2) Always merge 'blocked revisions' between branches. If you ask
svnmerge.py to not merge r10 from branchA to branchB, and then merge
changes from branchB to branchC, you've therefore asked svnmerge.py to
not merge r10 from branchA to branchC.

Which choice do you think would be better? I tend to favour option (2).

Cheers,

David

--
David James -- http://www.cs.toronto.edu/~james
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Mar 21 23:59:44 2006

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