[Svnmerge] [PATCH] Handle transitive merging property conflictsforbothmerged/blockedrevs

[Piet-Hein Peeters]

The simpler test case:

merge from trunk -> branch1 ->branch2

step 1:  merge from trunk to branch1 (svnmerge.py merge -r22-23)
step 2: Commit to branch1 (svnmerge-integrated property has changed)
(Committed revision 71)
step 3: merge resulting revision from branch1 to branch2 (svnmerge.py merge
-r71)

step 3 results on a conflict on branch2:
Trying to change property 'svnmerge-integrated' from '/trunk:1-18' to
'/trunk:1-18,22-23',
but the property does not exist.

However, the property has the right value already!
Properties on '.':
  svnmerge-integrated : /branches/branch1:1-17,61-62,71

I can't make it simpler than this. A conflict is raised and a
dir_conflicts.prej file is generated everytime a revision is merged is
which the svnmerge-integrated property has changed.

Regards,
Piet-Hein Peeters
Software Configuration Manager
----------------------------------------------------------------------------

Philips Medical Systems - Healthcare Informatics / PII
Room QV-136, P.O. Box 10.000, NL - 5680 DA Best
Phone +31 40 27 62016
----------------------------------------------------------------------------

Raman Gupta <rocketraman at fastmail.fm> wrote on 08/07/2007 05:32:07 AM:

> Piet-Hein Peeters wrote:
> > Any other ideas why I get a merge conflict on the properties?
>
> Unfortunately not. Is this reproducible in a simpler test case or does
> it only occur in your production tree?
>
> Cheers,
> Raman Gupta
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/svnmerge/attachments/20070807/e514a5f5/attachment.html>