[Svnmerge] Conflict on svnmerge-blocked property

[Daniel Rall]

On Fri, 20 Apr 2007, Raman Gupta wrote:

> dustin at zmanda.com wrote:
> > On Fri, Apr 20, 2007 at 10:48:04AM -0400, Raman Gupta wrote:
> >> I can confirm the problem. This is another case of svnmerge.py not
> >> supporting transitive (or graph-based) merges properly.
> > 
> > I could probably write a test case for this, if someone else thinks they
> > could track down the problem..
> 
> A test case would really help -- the fix should actually be pretty
> simple -- just ignore any merged changes to any of the svnmerge
> integrated properties, and set them explicitly at the end of the merge.
> 
> This would of course prevent merge information from other "distant"
> branches being merged into the current branch implicitly (the
> "illusion" of graph-based merging that svnmerge.py currently
> provides). Personally I consider that a feature -- since I didn't
> explicitly "init" merging with that distant branch, I don't want
> unrelated merge information from it cluttering up my target branch.

TestCase_TestRepo.testMergeWithPotentialPropertyConflict (currently
XFAIL) in svnmerge_test.py is related to transitive merges.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20070420/a5be4819/attachment-0002.pgp>