[Python-Dev] [Python-checkins] Merging to the 3.0 maintenance branch

[Antoine Pitrou]

Nick Coghlan <ncoghlan <at> gmail.com> writes:
> 
> Doing "svn resolved ." assumes that you did everything else correctly,
> and even then I don't see how svnmerge could both backport the py3k
> changes to the metadata and make its own changes and still get the
> metadata to a sane state.

The metadata are discriminated by source merge URL. That is, the py3k metadata
are of the form "/python/trunk:<list of revisions>" while the release30-maint
metadata are of the form "/python/branches/py3k:<list of revisions>". (*)
I guess that's what allows svn to not shoot itself in the foot when merging.

I did "svn resolved ." again yesterday and it doesn't seem to have borked
anything.

(*) (try "svn propget svnmerge-integrated" or "svn propget svnmerge-blocked")

Regards

Antoine.