Raman Gupta <[EMAIL PROTECTED]> 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
------------------------------------------------------------------------ r11324 | pietheinpeeters | 2007-08-02 09:52:41 +0200 (Thu, 02 Aug 2007) | 66 lines Merged revisions 11297-11298,11303,11305-11306,11311-11313,11316-11318 via svnmerge from https://mip.sc-phlps.sfo.collab.net/svn/mip/branches/pmw ------------------------------------------------------------------------
dir_conflicts2.prej
Description: Binary data
D:\dev\merge-pmw72>svn proplist --verbose -r11323 Properties on 'https:\\mip.sc-phlps.sfo.collab.net\svn\mip\trunk': tsvn:logtemplate : SCxxxx: bugtraq:url : https://mip.sc-phlps.sfo.collab.net/servlets/Scarab?id=%BUGID% tsvn:logminsize : 12 svnmerge-blocked : /branches/pmw:10823,10973 bugtraq:append : false tsvn:logwidthmarker : 80 bugtraq:number : false svnmerge-integrated : /branches/dicomviewer24:1-10874 /branches/pmw:1-10822,10824-10972,10974-11293 bugtraq:logregex : (SC\d{4}) bugtraq:warnifnoissue : true D:\dev\merge-pmw72>svn proplist --verbose -r11324 Properties on 'https:\\mip.sc-phlps.sfo.collab.net\svn\mip\trunk': bugtraq:url : https://mip.sc-phlps.sfo.collab.net/servlets/Scarab?id=%BUGID% tsvn:logtemplate : SCxxxx: tsvn:logminsize : 12 bugtraq:append : false svnmerge-blocked : /branches/pmw:10823,10973 tsvn:logwidthmarker : 80 bugtraq:number : false svnmerge-integrated : /branches/dicomviewer24:1-10874 /branches/pmw:1-10822,10824-10972,10974-11318 bugtraq:logregex : (SC\d{4}) bugtraq:warnifnoissue : true
D:\dev\merge_pii81>svn proplist --verbose -r11338 Properties on 'https:\\mip.sc-phlps.sfo.collab.net\svn\mip\branches\pii81': bugtraq:url : https://mip.sc-phlps.sfo.collab.net/servlets/Scarab?id=%BUGID% tsvn:logtemplate : SCxxxx: tsvn:logminsize : 12 bugtraq:append : false svnmerge-blocked : /branches/pmw:7427 tsvn:logwidthmarker : 80 bugtraq:number : false svnmerge-integrated : /branches/pmw:1-7426,7428-8611 /trunk:1-11309 bugtraq:logregex : (SC\d{4}) bugtraq:warnifnoissue : true D:\dev\merge_pii81>svn proplist --verbose -r11339 Properties on 'https:\\mip.sc-phlps.sfo.collab.net\svn\mip\branches\pii81': tsvn:logtemplate : SCxxxx: bugtraq:url : https://mip.sc-phlps.sfo.collab.net/servlets/Scarab?id=%BUGID% tsvn:logminsize : 12 svnmerge-blocked : /branches/pmw:7427 bugtraq:append : false tsvn:logwidthmarker : 80 bugtraq:number : false svnmerge-integrated : /branches/pmw:1-7426,7428-8611 /trunk:1-11324 bugtraq:logregex : (SC\d{4}) bugtraq:warnifnoissue : true
_______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
