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

Re: [Svnmerge] Merging blocked revisions between branches

From: Blair Zajac <blair_at_orcaware.com>
Date: 2006-03-22 19:15:15 CET

David James wrote:
> 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).

Can you explain where this would occur?

If you're sitting in branchB, you can clearly block r10 from branchA. But if
you're in branchC, then you won't pull r10 through via branchB since branchB has
it blocked. However, if you've set up branchC to pull revisions directly from
branchA, then it sounds like branchC should look in branchB's svnmerge-blocked
property to block it?

So I don't see how r10 can end up in branchC unless you set up branchC to merge
from branchA.

Regards,
Blair

-- 
Blair Zajac, Ph.D.
<blair@orcaware.com>
Subversion training, consulting and support
http://www.orcaware.com/svn/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Mar 22 19:15:58 2006

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