[Svnmerge] Merging blocked revisions between branches

[Alan Barrett]

On Tue, 21 Mar 2006, David James wrote:
> 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.

I favour option 1.  If the user wants to merge from A to C both
indirectly "A --> B --> C" and also directly "A --> C", then presumably
they have their own good reasons for that.  Marking a change as "not
wanted in branch B" shouldn't be interpreted as "not wanted in branch
C".

--apb (Alan Barrett)