[Svnmerge] Conflict on svnmerge-blocked property

[Piet-Hein Peeters]

dustin at zmanda.com wrote on 04/24/2007 12:29:38 AM:

> > Piet-Hein Peeters wrote:
> > > I do not have the knowlegde to do so, but I can describe the
> > > testcase more precisly for you. In a repository I have a trunk,
> > > branch A and branch B Merge strategy is as follows: Merge
> > > changesets from Branch B to A and from branch A to trunk
> > > 
> > > revision x of branch B is blocked by setting "svnmerge.py block
> > > -rx" on branch A revision y of branch A is blocked by setting
> > > "svnmerge.py block -ry" on trunk
> > > 
> > > When a merge is done from branch A to trunk, I get the following
> > > merge conflict: Trying to add new property 'svnmerge-blocked' with
> > > value '/branches/branchB:x', but property already exists with value
> > > '/branches/branchA:y'.
> 
> I had to interpret "a merge" in the final paragraph as meaning "merge
> all available revisions", specifically the revision where revision x was
> blocked on branch A.  A patch to the subversion test cases is attached
> (although the name of the test case is probably not appropriate).  The
> test case is configured such that Raman's patch should pass it, but I've
> not tested that. 
> 
> Either way, it's worth having the test in there.
> 
> Dustin
> 

Your interpretation is correct. Thanks for spending your time on this.

Regards,
Piet-Hein
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/svnmerge/attachments/20070424/93d79a12/attachment.html>