Changes between Version 20 and Version 21 of ReleaseProcess

Timestamp:

07/28/11 15:30:32 (3 years ago)

Author:

dread

Comment:

--

ReleaseProcess

@@ -27 +27 @@
 $ hg ci -m '[release]: branch.'
 }}}
- 1. Update version number on default:
+ 1. Get merge to default right with new version number:
 {{{
 $ hg up default
+$ hg merge -r release-v1.2
 }}}
     Edit ckan/__init__.py with incremented number but alpha: e.g. 1.2a
+    And edit pip-requirements.txt to use default branch not the release branch.
  1. Commit the change and push everything:
 {{{
-$ hg ci -m '[release]: Increment version number in anticipation of next version.'
+$ hg ci -m '[merge,release]: Merge from release branch and increment version number in anticipation of next version.'
 $ hg push
 }}}