[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: David James <djames_at_collab.net>
Date: 2006-03-22 00:27:34 CET

On 3/21/06, Justin Erenkrantz <justin@erenkrantz.com> wrote:
> On 3/21/06, David James <djames@collab.net> wrote:
> > Currently, svnmerge.py is not consistent about whether blocked
> > revisions are merged between branches. Currently, blocked revisions
> What's a 'blocked revision'? -- justin

svnmerge.py allows you to say "I don't want to merge r10 from branch A
to branch B", either because it has already been merged manually, or
because you have decided that it doesn't belong on branch B. Such
revisions, which are 'blocked from merging', are referred to as
blocked changes.

My question: If you mark r10 as 'blocked', so that it won't get merged
from branch A to branch B, and then you merge changes from branch B to
branch C, should r10 also be marked as 'blocked' on branch C?



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 Wed Mar 22 00:27:56 2006

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