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 _______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
