[Python-Dev] Commands for correctly merging to the python 3.0 maintenance branch (original) (raw)
Nick Coghlan ncoghlan at gmail.com
Tue Dec 30 08:35:45 CET 2008
- Previous message: [Python-Dev] Use -M option on buildbots?
- Next message: [Python-Dev] Commands for correctly merging to the python 3.0 maintenance branch
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
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 svn revert . svnmerge -M -F <test change still works, etc> 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 at gmail.com | Brisbane, Australia
- Previous message: [Python-Dev] Use -M option on buildbots?
- Next message: [Python-Dev] Commands for correctly merging to the python 3.0 maintenance branch
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]