Piet-Hein Peeters wrote: > > Raman Gupta <[EMAIL PROTECTED]> wrote on 03/29/2007 05:25:01 PM: > >> Please provide a test case in the form of an update to the >> svnmerge_test.py, or as a shell script that initializes a >> repository and then uses it to reproduce your error. That'll make >> it much easier to investigate this. > > 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 can confirm the problem. This is another case of svnmerge.py not supporting transitive (or graph-based) merges properly. > Is there a patch available for this? I would have expected that the > patched svnmerge.py also would work on the svnmerge-blocked > property and not only on the svnmerge-integrated property. Sorry, no, there is no patch at this time, and I don't have the bandwidth right now to work on it. Cheers, Raman Gupta _______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
