Raman Gupta <[EMAIL PROTECTED]> wrote on 08/02/2007 09:09:07 PM: > Piet-Hein Peeters wrote: > > 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 > > > D:\dev\merge_pii81>svn proplist --verbose -r11338 > > Properties on 'https:\\mip.sc-phlps.sfo.collab.net\svn\mip\branches\pii81': > > svnmerge-integrated : /branches/pmw:1-7426,7428-8611 /trunk:1-11309 > > Could this be the source of the problem? Your pii81 branch has merge > properties from pmw, even though based on your diagram there should be > no direct relationship with pmw -- only with trunk. > > If this is not what you intended, then this is probably from using > svnmerge.py prior to my transitive merge patch, which would have > copied over the pmw information during some merge. If this *is* what > you intended then I can't help you because svnmerge.py does not > support graph merging. > > My suggestion -- uninit pmw merging into pii81 and try again. > > Cheers, > Raman
Hello Raman, I've tried your suggestion, but unfortunate, that didn't help. After the uninit of branches/pmw on pii81, I did a merge from trunk to branches/pii81 Revisions to merge: 11351-11352 revision 11351 (@trunk) is the resulting revision from a merge from /branches/pmw svn log r11351:11352 (See attached file: svn_log_r11351_11352.txt) Revision range 11351-11352 is merged to a WC of pii81 at revision 11361 dir_conflict file after merge:(See attached file: dir_conflicts.prej) Resulting revision after commit of merge: 11362 svn proplist of trunk @ r11350 and r11352: (See attached file: svn_proplist_trunk.txt) Note that only svnmerge-integrated property is changed. svn proplist of pii81 @ r11361 and r11362: (See attached file: svn_proplist_pii81.txt) Any other ideas why I get a merge conflict on the properties? Regards, Piet-Hein
------------------------------------------------------------------------ r11351 | pietheinpeeters | 2007-08-03 09:18:55 +0200 (Fri, 03 Aug 2007) | 83 lines Merged revisions 11320-11344 via svnmerge from https://mip.sc-phlps.sfo.collab.net/svn/mip/branches/pmw ------------------------------------------------------------------------ r11352 | nikachkhaidze | 2007-08-03 10:25:38 +0200 (Fri, 03 Aug 2007) | 1 line SC4594: Reentrant Revisualize solution ------------------------------------------------------------------------
dir_conflicts.prej
Description: Binary data
D:\dev\merge-pmw72>svn proplist --verbose -r11350 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-pmw72>svn proplist --verbose -r11352 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-11344 bugtraq:logregex : (SC\d{4}) bugtraq:warnifnoissue : true
D:\dev\merge_pii81>svn proplist --verbose -r11361 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 tsvn:logwidthmarker : 80 bugtraq:number : false svnmerge-integrated : /trunk:1-11336 bugtraq:logregex : (SC\d{4}) bugtraq:warnifnoissue : true D:\dev\merge_pii81>svn proplist --verbose -r11362 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 bugtraq:append : false tsvn:logwidthmarker : 80 bugtraq:number : false svnmerge-integrated : /trunk:1-11352 bugtraq:logregex : (SC\d{4}) bugtraq:warnifnoissue : true
_______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
