Getting the svnmerge-intergrated property right when merging
trunk->py3k->release30 is a little tricky. The most concise set of
instructions I have found which gets it right is to do the following in
the 3.0 maintenance branch after committing to the py3k branch:
svn update
svnmerge merge -r <py3k-rev>
svn revert .
svnmerge -M -F <py3k-rev>
svn commit -F svnmerge-commit-message.txt
Revert and property changes on "." and running that second svnmerge line
is also useful if you do a "svn update" after the first svnmerge and get
a conflict on the svnmerge-intregrated property. The -M option tells the
utility to only make the property changes, while the -F tells it to go
ahead despite the existence of local modification.
Cheers,
Nick.
--
Nick Coghlan | ncoghlan@gmail.com | Brisbane, Australia
---------------------------------------------------------------
