# HG changeset patch # User Anton Shestakov # Date 1637297568 -10800 # Node ID a4b6a863c3bd5d40311bc2f75932f85a8ce5b001 # Parent 5c921c26dc4092dadaaa57cf27dfb440b453ec87# Parent d97d5ab35b96ff4190ccfde09d5a0de01e70f067 test-compat: merge mercurial-5.0 into mercurial-4.9 diff -r 5c921c26dc40 -r a4b6a863c3bd .hgtags --- a/.hgtags Tue Oct 12 13:29:56 2021 +0300 +++ b/.hgtags Fri Nov 19 07:52:48 2021 +0300 @@ -96,3 +96,4 @@ 93dc3cb6884259f91d739a1cfe993a01820c729c 10.3.1 30c8d8e6a7f4056c46a868b47ee949d3bdb48c4c 10.3.2 cca465bf6a6a103449aa58deecdffba8e546f7c6 10.3.3 +de530d27554b43c00509696dc7a1496f5129e1a4 10.4.0 diff -r 5c921c26dc40 -r a4b6a863c3bd CHANGELOG --- a/CHANGELOG Tue Oct 12 13:29:56 2021 +0300 +++ b/CHANGELOG Fri Nov 19 07:52:48 2021 +0300 @@ -1,7 +1,7 @@ Changelog ========= -10.4.0 - in progress +10.4.0 -- 2021-10-12 -------------------- * evolve: use a more stable criteria for picking p1 when solving diff -r 5c921c26dc40 -r a4b6a863c3bd debian/changelog --- a/debian/changelog Tue Oct 12 13:29:56 2021 +0300 +++ b/debian/changelog Fri Nov 19 07:52:48 2021 +0300 @@ -1,4 +1,10 @@ -mercurial-evolve (10.3.3-1) UNRELEASED; urgency=medium +mercurial-evolve (10.4.0-1) unstable; urgency=medium + + * new upstream release + + -- Anton Shestakov Tue, 12 Oct 2021 17:22:11 +0300 + +mercurial-evolve (10.3.3-1) unstable; urgency=medium * new upstream release diff -r 5c921c26dc40 -r a4b6a863c3bd hgext3rd/evolve/__init__.py --- a/hgext3rd/evolve/__init__.py Tue Oct 12 13:29:56 2021 +0300 +++ b/hgext3rd/evolve/__init__.py Fri Nov 19 07:52:48 2021 +0300 @@ -273,6 +273,14 @@ [experimental] evolution=all + +To prevent users from creating content divergence, a check is performed by +default on the revisions being rewritten, and the operation is aborted if it +creates divergence. If users want to allow creating content divergent +changesets, this check can be turned off by setting the following config:: + + [experimental] + evolution.allowdivergence=True """ import sys diff -r 5c921c26dc40 -r a4b6a863c3bd hgext3rd/evolve/cmdrewrite.py --- a/hgext3rd/evolve/cmdrewrite.py Tue Oct 12 13:29:56 2021 +0300 +++ b/hgext3rd/evolve/cmdrewrite.py Fri Nov 19 07:52:48 2021 +0300 @@ -1341,7 +1341,10 @@ _(b'[OPTION]... [-r] REV'), **compat.helpcategorykwargs('CATEGORY_CHANGE_MANAGEMENT')) def cmdpick(ui, repo, *revs, **opts): - """move a commit on the top of working directory parent and updates to it.""" + """move a commit onto the working directory parent and update to it. + + If there is an active topic, it will be used for the resulting changeset. + """ cont = opts.get('continue') abort = opts.get('abort') diff -r 5c921c26dc40 -r a4b6a863c3bd hgext3rd/evolve/metadata.py --- a/hgext3rd/evolve/metadata.py Tue Oct 12 13:29:56 2021 +0300 +++ b/hgext3rd/evolve/metadata.py Fri Nov 19 07:52:48 2021 +0300 @@ -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.4.0.dev' +__version__ = b'10.4.1.dev' testedwith = b'4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9' minimumhgversion = b'4.7' buglink = b'https://bz.mercurial-scm.org/' diff -r 5c921c26dc40 -r a4b6a863c3bd hgext3rd/topic/__init__.py --- a/hgext3rd/topic/__init__.py Tue Oct 12 13:29:56 2021 +0300 +++ b/hgext3rd/topic/__init__.py Fri Nov 19 07:52:48 2021 +0300 @@ -231,7 +231,7 @@ b'log.topic': b'green_background', } -__version__ = b'0.23.0.dev' +__version__ = b'0.23.1.dev' testedwith = b'4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9' minimumhgversion = b'4.7' diff -r 5c921c26dc40 -r a4b6a863c3bd tests/test-evolve-obshistory-amend-then-fold.t diff -r 5c921c26dc40 -r a4b6a863c3bd tests/test-evolve-obshistory-amend.t diff -r 5c921c26dc40 -r a4b6a863c3bd tests/test-evolve-obshistory-content-divergent.t diff -r 5c921c26dc40 -r a4b6a863c3bd tests/test-evolve-obshistory-fold.t diff -r 5c921c26dc40 -r a4b6a863c3bd tests/test-evolve-obshistory-lots-of-splits.t diff -r 5c921c26dc40 -r a4b6a863c3bd tests/test-evolve-obshistory-prune.t diff -r 5c921c26dc40 -r a4b6a863c3bd tests/test-evolve-obshistory-split.t diff -r 5c921c26dc40 -r a4b6a863c3bd tests/test-evolve.t --- a/tests/test-evolve.t Tue Oct 12 13:29:56 2021 +0300 +++ b/tests/test-evolve.t Fri Nov 19 07:52:48 2021 +0300 @@ -105,6 +105,14 @@ [experimental] evolution=all + + To prevent users from creating content divergence, a check is performed by + default on the revisions being rewritten, and the operation is aborted if + it creates divergence. If users want to allow creating content divergent + changesets, this check can be turned off by setting the following config: + + [experimental] + evolution.allowdivergence=True various init diff -r 5c921c26dc40 -r a4b6a863c3bd tests/test-pick.t --- a/tests/test-pick.t Tue Oct 12 13:29:56 2021 +0300 +++ b/tests/test-pick.t Fri Nov 19 07:52:48 2021 +0300 @@ -29,7 +29,9 @@ aliases: grab - move a commit on the top of working directory parent and updates to it. + move a commit onto the working directory parent and update to it. + + If there is an active topic, it will be used for the resulting changeset. options: diff -r 5c921c26dc40 -r a4b6a863c3bd tests/test-prune.t diff -r 5c921c26dc40 -r a4b6a863c3bd tests/test-topic.t diff -r 5c921c26dc40 -r a4b6a863c3bd tests/test-userguide.t