On Fri, Dec 5, 2008 at 11:20, Mark Dickinson <[EMAIL PROTECTED]> wrote: > On Thu, Dec 4, 2008 at 3:12 PM, Christian Heimes <[EMAIL PROTECTED]> wrote: >> Flow diagram >> ------------ >> >> trunk ---> release26-maint >> \-> py3k ---> release30-maint >> > > I'm running into problems making this work, with a trivial change: > I committed r67590 (which adds a single assert to ast.c) to the > trunk, then merged to 2.6 and py3k in r67592 and r67595 respectively. > Then I tried: > > ../svnmerge.py merge -r67595 > > from the root directory of a clean copy of the release30-maint > branch (svn status gives no output), and got conflicts on '.': > > property 'svnmerge-integrated' set on '.' > > property 'svnmerge-blocked' set on '.' > > --- Merging r67595 into '.': > U Python/ast.c > C . > > property 'svnmerge-integrated' set on '.' > > property 'svnmerge-blocked' deleted from '.'. > > I now have a new file dir_conflicts.prej that looks something like: > > Trying to change property 'svnmerge-integrated' from > '/python/trunk:1-61437,...,67528,67590', but property has been locally > changed from > '/python/branches/py3k:1-67498,67522-67524,67539,67541,67559,67588' to > '/python/trunk:1-61437,...,67467,67484,67528'. > > (where the ... abbreviates a big long list of revision numbers). > > Did I mess up somewhere, or does svnmerge not work on > a revision that was itself the result of an svnmerge?
Someone might know better than me, but I am willing to bet you can't svnmerge a svnmerge revision. Since the svnmerge revision contains changes to the metadata on . that will conflict with the new svnmerge values that the svnmerge you are trying to do causes. But if I am right about this then won't that require blocking the svnmerge revision on release30-maint the svnmerge revision on py3k? Ugh. Is this getting to the point that we can only svnmerge between trunk and py3k and the maintenance branches just have to be managed the old-fashion way? And I have pinged the people helping me with the DVCS PEP in hopes of getting us moved off of svn sooner rather than later. -Brett _______________________________________________ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
