[Svnmerge] [PATCH] Handle transitive merging property conflictsforbothmerged/blocked revs

[Piet-Hein Peeters]

Raman Gupta <rocketraman at fastmail.fm> wrote on 08/02/2007 03:11:46 PM:

> Piet-Hein Peeters wrote:
> > 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
             ^^^^^^
Ai... this probably why you didn't understand the branch relationships, the
pmw branch is the target, not the source.
Sorry for that.

> > dicomviewer23.
> >
>
> I don't understand the branch relationships... can you be more
> specific? Maybe the easiest thing is just do give us a pl --verbose
> for the trunk, pmw, and dicomviewer23 branches.
>
> Cheers,
> Raman Gupta
>

I'll give you a more clear example:

merge strategy:
/branches/dicomviewer24 ---
                          _\|
/branches/pmw ----------> trunk -> branches/pii81


Conflict on merge-properties in the following example:
merge from trunk -> branches/pii81
revision to merge: 11324 (@trunk) which is the resulting revision from a
merge from /branches/pmw

svn log r11324: (See attached file: svn_log_r11324.txt)

revision 11324 is merged to a WC of pii81 at revision 11338
dir_conflict file after merge:(See attached file: dir_conflicts2.prej)
Resulting revision after commit of merge: 11339
svn proplist of trunk @ r11323 and r11324: (See attached file:
svn_proplist_trunk.txt)
Note that only svnmerge-integrated property is changed.
svn proplist of pii81 @ r11338 and r11339: (See attached file:
svn_proplist_pii81.txt)

I hope this helps you in analyzing the problem.
Summary: the svnmerge-integrated property has changed in the revision range
that is merged. However the new value of the svnmerge-integrated property
can not be changed/set because the property on the target does not exist
(for a while).

Regards,
Piet-Hein
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/svnmerge/attachments/20070802/80decad9/attachment.html>
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: svn_log_r11324.txt
URL: </pipermail/svnmerge/attachments/20070802/80decad9/attachment-0006.txt>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dir_conflicts2.prej
Type: application/octet-stream
Size: 391 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20070802/80decad9/attachment-0002.obj>
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: svn_proplist_trunk.txt
URL: </pipermail/svnmerge/attachments/20070802/80decad9/attachment-0007.txt>
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: svn_proplist_pii81.txt
URL: </pipermail/svnmerge/attachments/20070802/80decad9/attachment-0008.txt>