Mercurial > evolve
changeset 5842:ce765eb3cfd2
branching: redo the stable->default merge (preserving test changes on default)
CORE-TEST-OUTPUT-UPDATE: 768056549737
CORE-TEST-OUTPUT-UPDATE: dc00324e80f4
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Fri, 12 Mar 2021 18:07:48 +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 | 4 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/metadata.py Thu Mar 11 18:56:59 2021 +0800 +++ b/hgext3rd/evolve/metadata.py Fri Mar 12 18:07:48 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 Fri Mar 12 18:07:48 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 Fri Mar 12 18:07:48 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 Fri Mar 12 18:07:48 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')