Hello Raman, I've performed the merge of a branch called pmw to the trunk. This branch is part of transitive merging so merge-tracking properties are also set on the branch pmw. It's the source for merges from other branches called 62v1 and dicomviewer23.
The dir-conflicts file shows the following conflict information on the
merge-tracking properties:
Trying to change property 'svnmerge-blocked' from
'/branches/dicomviewer23:7966,8003,8147,8177,8287,8293,8385,8403,8482,8524,10327,10332'
to
'/branches/dicomviewer23:7966,8003,8147,8177,8287,8293,8385,8403,8482,8524,10327,10332',
but the property does not exist.
Trying to change property 'svnmerge-integrated' from
'/branches/62v1:1-10944
/branches/dicomviewer23:1-7923,7936-7965,7967-8002,8004-8051,8086,8151,8206,8229,8250,8263,8277,8282,8301-8302,8305,8324,8333-8377,8395,8398,8433,8436,8438,8451,8455-8456,8475-8481,8483-8499,10232'
to '/branches/62v1:1-10944
/branches/dicomviewer23:1-7923,7936-7965,7967-8002,8004-8051,8086,8151,8206,8229,8250,8263,8277,8282,8301-8302,8305,8324,8333-8377,8395,8398,8433,8436,8438,8451,8455-8456,8475-8481,8483-8499,10232',
but the property does not exist.
Seems that spurious merge conflicts on the merge-tracking properties still
occur in case of transitive merging.
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
----------------------------------------------------------------------------
To
Piet-Hein
Peeters/BST/MS/[EMAIL PROTECTED]
Raman Gupta cc
<[EMAIL PROTECTED] "[email protected]"
l.fm> <[email protected]>
Subject
07/13/2007 03:47 PM Re: [Svnmerge] [PATCH] Handle
transitive merging property
conflictsforboth merged/blocked
revs
Classification
Piet-Hein Peeters wrote:
> Hello,
>
> I've tested the patch with the handling of transititive mergering
> property conflicts.
> The conflicts are 'resolved' correctly and the properties have the
> correct value after the merge. However, the dir_conflicts.prej file is
> not deleted which causes that svn status still detects a merge conflict
> and the commit is blocked.
With the trunk version (which has the patch integrated) there should
not be any directory property conflicts at all, and therefore no
dir_conflicts file... can you post a short reproduction recipe for it?
Thanks,
Raman Gupta
<<inline: graycol.gif>>
<<inline: pic00331.gif>>
<<inline: ecblank.gif>>
_______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
