On 24/1/19 8:38 pm, Armin Rigo wrote:
Hi Anto,
1) hg up -r default 2) hg branch release-pypy2.7-7.x 3) bump the version number to 7.0.0-final (commit d47849ba8135) 4) hg up -r default 5) hg merge release-pypy2.7-7.x (commit c4dc91f2e037) 6) bump the version number (on default) to 7.1.0-alpha0 (commit f3cf624ab14c) 7) merge default into release-pypy2.7-7.x, editing the files before the commit to avoid changing the version again (commit 7986159ef4d8) I think you can in theory do it in less steps by doing only one merge with more complicated edits, if you set things up properly (maybe make
On Thu, 24 Jan 2019 at 18:40, Antonio Cuni <anto.cuni@gmail.com> wrote: the branch, commit the version number 7.0.0-final, and merge that back to default but editing the version to 7.1.0-alpha0 in the merge commit...). Looks like even more of a hack than your 7 steps, though.
A bientôt, Armin _______________________________________________ pypy-dev mailing list pypy-dev@python.org https://mail.python.org/mailman/listinfo/pypy-dev
In the past I did the same, just without step 5, since anyway I needed to merge carefully in step 7 See 2e04adf1b89f-d2c8301f4536 which also renames the whatsnew-head Matti