Mercurial > evolve
changeset 4892:38079b848657
branching: merge back into default
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sat, 05 Oct 2019 14:31:19 -0400 |
| parents | a9929dd36405 (diff) 77e8ca85d740 (current diff) |
| children | d3ad50b40a4e |
| files | hgext3rd/evolve/metadata.py hgext3rd/topic/__init__.py |
| diffstat | 6 files changed, 34 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Oct 04 14:16:52 2019 -0400 +++ b/.hgtags Sat Oct 05 14:31:19 2019 -0400 @@ -82,3 +82,4 @@ 756db65030c64b22836fe236d1db3b95477e3ef7 9.0.0 6f37fdad7ac123ca0a76872ac4639bd1f3c248f7 9.1.0 40795751be1c329ec23202ecd79ba45623e1df66 9.2.0 +d989bab720e5f7638a9e58fda76cf3f4b40d0611 9.2.1
--- a/CHANGELOG Fri Oct 04 14:16:52 2019 -0400 +++ b/CHANGELOG Sat Oct 05 14:31:19 2019 -0400 @@ -1,6 +1,16 @@ Changelog ========= +9.2.2 - in progress +------------------- + + * pick: don't create any successors when there were no changes (issue6093), + +9.2.1 -- 2019-10-05 +------------------- + + * setup: fix install on python 3 + 9.2.0 -- 2019-09-28 -------------------
--- a/MANIFEST.in Fri Oct 04 14:16:52 2019 -0400 +++ b/MANIFEST.in Sat Oct 05 14:31:19 2019 -0400 @@ -2,6 +2,7 @@ exclude .hg-format-source recursive-exclude contrib * exclude hgext3rd/evolve/hack +exclude .gitlab-ci.yml recursive-exclude hgext3rd/evolve/hack * exclude hgext3rd/evolve/legacy.py exclude Makefile
--- a/debian/changelog Fri Oct 04 14:16:52 2019 -0400 +++ b/debian/changelog Sat Oct 05 14:31:19 2019 -0400 @@ -1,3 +1,9 @@ +mercurial-evolve (9.2.1-1) UNRELEASED; urgency=medium + + * new upstream release + + -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Sat, 05 Oct 2019 13:48:02 -0400 + mercurial-evolve (9.2.0-1) unstable; urgency=medium * new upstream release
--- a/hgext3rd/evolve/cmdrewrite.py Fri Oct 04 14:16:52 2019 -0400 +++ b/hgext3rd/evolve/cmdrewrite.py Sat Oct 05 14:31:19 2019 -0400 @@ -1519,8 +1519,11 @@ if pickstate: pickstate.delete() - newctx = repo[newnode] if newnode else pctx - replacements = {origctx.node(): [newctx.node()]} + if newnode is None: + replacements = {origctx.node(): []} + else: + newctx = repo[newnode] + replacements = {origctx.node(): [newctx.node()]} scmutil.cleanupnodes(repo, replacements, operation=b"pick") if newnode is None:
--- a/tests/test-pick.t Fri Oct 04 14:16:52 2019 -0400 +++ b/tests/test-pick.t Sat Oct 05 14:31:19 2019 -0400 @@ -172,6 +172,17 @@ | o 0:1f0dee641bb7 add a + +there were no changes to commit, so there shouldn't be any predecessors of 6, +and 2 should say it was pruned (issue6093) + + $ hg olog --all --hidden -r 2+6 + x 4538525df7e2 (2) add c + pruned using pick by test (Thu Jan 01 00:00:00 1970 +0000) + + @ c4636a81ebeb (6) add c + + interrupted pick $ hg up d46dc301d92f