Mercurial > evolve
changeset 5841:7dfb3b267070
branching: merge stable into default (preserving test changes on default)
CORE-TEST-OUTPUT-UPDATE: 768056549737
CORE-TEST-OUTPUT-UPDATE: dc00324e80f4
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 11 Mar 2021 19:06:38 +0800 |
| parents | 82040a455e71 (diff) 845a461728c9 (current diff) |
| children | 6798147f6e58 |
| files | hgext3rd/evolve/metadata.py hgext3rd/topic/__init__.py tests/test-evolve-interrupted.t tests/test-prev-next.t |
| diffstat | 9 files changed, 14 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/.gitlab-ci.yml Thu Mar 11 18:56:59 2021 +0800 +++ b/.gitlab-ci.yml Thu Mar 11 19:06:38 2021 +0800 @@ -82,14 +82,3 @@ artifacts: paths: - html/* - -sdist: - stage: .post - image: registry.heptapod.net/mercurial/ci-images/py3-hgext3rd - script: - - python3 setup.py sdist - artifacts: - paths: - - dist/* - only: - - tags
--- a/.hgtags Thu Mar 11 18:56:59 2021 +0800 +++ b/.hgtags Thu Mar 11 19:06:38 2021 +0800 @@ -92,4 +92,3 @@ 782cbadb123fe4991e91a03d367e02d0b5ae969c 10.1.0 35b883a4ff5a97973eb9e6f00014e71f14cebe70 10.2.0 eadc1d09f2f567fdae7280aefc8cf4cdc4d78cbc 10.2.0.post1 -c0ed8e57463875414d1c06f0428d550c4480d289 10.3.0
--- a/CHANGELOG Thu Mar 11 18:56:59 2021 +0800 +++ b/CHANGELOG Thu Mar 11 19:06:38 2021 +0800 @@ -1,30 +1,25 @@ Changelog ========= -10.3.0 -- 2021-03-11 +10.3.0 - in progress -------------------- - * doc: document stack as a substitue for MQ's qseries - * doc: document revsets provided by evolve extension - * evolve: add a experimental.evolution.in-memory config for running evolve in memory (hg >= 5.6) * evolve: improve content-divergence resolution that involves parent changes * evolve: preserve wdir parent when using `hg evolve --stop` - * obslog: clarify the command name in the help, - * pdiff, pstatus: drop some irrelevant command flags inherited from `hg diff` and `hg status` respectively - * rewind: detect and abort on cases when we rewind to changesets that are precessors / successors of each other * rewind: when user gives only some parts of a fold, include the other parts as well, or abort if they are missing from local repo -topic (0.22.0) +10.2.1 - in progress +-------------------- - * doc: change topic phrase 'disappear' to 'fade out' + * doc: document stack as a substitue for MQ's qseries 10.2.0.post1 -- 2021-02-01 --------------------------
--- a/debian/changelog Thu Mar 11 18:56:59 2021 +0800 +++ b/debian/changelog Thu Mar 11 19:06:38 2021 +0800 @@ -1,9 +1,3 @@ -mercurial-evolve (10.3.0-1) unstable; urgency=medium - - * new upstream release - - -- Anton Shestakov <av6@dwimlabs.net> Thu, 11 Mar 2021 18:32:26 +0800 - mercurial-evolve (10.2.0.post1-1) unstable; urgency=medium * identical release
--- a/hgext3rd/evolve/evolvecmd.py Thu Mar 11 18:56:59 2021 +0800 +++ b/hgext3rd/evolve/evolvecmd.py Thu Mar 11 19:06:38 2021 +0800 @@ -890,6 +890,7 @@ Each hash in the description will be detected and, if matching an obsolete changeset, it will be replaced by its successors. + Note: They might be case were such behavior might be is wrong, for example if the commit message is explicitely referencing an older, obsolete changesets. """ @@ -1060,6 +1061,7 @@ return None return repo.commitctx(memctx) + def _finalizerelocate(repo, orig, dest, nodenew, tr, category, evolvestate): if nodenew is not None: obsolete.createmarkers(repo, [(orig, (repo[nodenew],))],
--- a/hgext3rd/evolve/metadata.py Thu Mar 11 18:56:59 2021 +0800 +++ b/hgext3rd/evolve/metadata.py Thu Mar 11 19:06:38 2021 +0800 @@ -5,7 +5,7 @@ # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. -__version__ = b'10.3.1.dev' +__version__ = b'10.4.0.dev' testedwith = b'4.6.2 4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7' minimumhgversion = b'4.6' buglink = b'https://bz.mercurial-scm.org/'
--- a/hgext3rd/topic/__init__.py Thu Mar 11 18:56:59 2021 +0800 +++ b/hgext3rd/topic/__init__.py Thu Mar 11 19:06:38 2021 +0800 @@ -232,7 +232,7 @@ b'topic.active': b'green', } -__version__ = b'0.22.1.dev' +__version__ = b'0.23.0.dev' testedwith = b'4.6.2 4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7' minimumhgversion = b'4.6'
--- a/tests/test-evolve-interrupted.t Thu Mar 11 18:56:59 2021 +0800 +++ b/tests/test-evolve-interrupted.t Thu Mar 11 19:06:38 2021 +0800 @@ -48,7 +48,7 @@ transaction abort! rollback completed abort: precommit hook exited with status 1 - [255] + [40] $ hg l @ 2 apricot and blueberry @@ -107,7 +107,7 @@ transaction abort! rollback completed abort: precommit hook exited with status 1 - [255] + [40] $ cat b banana $ hg evolve --stop @@ -132,7 +132,7 @@ transaction abort! rollback completed abort: precommit hook exited with status 1 - [255] + [40] $ hg evolve --continue evolving 1:e0486f65907d "banana" working directory is now at bd5ec7dfc2af
--- a/tests/test-prev-next.t Thu Mar 11 18:56:59 2021 +0800 +++ b/tests/test-prev-next.t Thu Mar 11 19:06:38 2021 +0800 @@ -431,7 +431,7 @@ $ hg prev abort: conflicting changes (do you want --merge?) - [255] + [20] $ echo hi > bar $ hg prev @@ -443,7 +443,7 @@ $ hg next abort: conflicting changes (do you want --merge?) - [255] + [20] Test that --merge still works fine with commands.update.check set @@ -454,7 +454,7 @@ $ hg next abort: conflicting changes (do you want --merge?) - [255] + [20] $ hg next --merge merging bar warning: conflicts while merging bar! (edit, then use 'hg resolve --mark')