Mercurial > evolve

changeset 6059:399ea41d5e37

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge with stable
author Anton Shestakov <av6@dwimlabs.net>
date Fri, 15 Oct 2021 11:37:42 +0300
parents be2008649675 (diff) 99153a05e1f5 (current diff)
children be9c35a8501d
files hgext3rd/evolve/metadata.py hgext3rd/topic/__init__.py
diffstat 12 files changed, 16 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/metadata.py	Fri Oct 15 11:36:03 2021 +0300
+++ b/hgext3rd/evolve/metadata.py	Fri Oct 15 11:37:42 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.1.dev'
+__version__ = b'10.5.0.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/'
--- a/hgext3rd/topic/__init__.py	Fri Oct 15 11:36:03 2021 +0300
+++ b/hgext3rd/topic/__init__.py	Fri Oct 15 11:37:42 2021 +0300
@@ -231,7 +231,7 @@
               b'log.topic': b'green_background',
               }
 
-__version__ = b'0.23.1.dev'
+__version__ = b'0.24.0.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'
--- a/tests/test-evolve-obshistory-amend-then-fold.t	Fri Oct 15 11:36:03 2021 +0300
+++ b/tests/test-evolve-obshistory-amend-then-fold.t	Fri Oct 15 11:37:42 2021 +0300
@@ -354,7 +354,7 @@
   $ hg update 471f378eab4c
   abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192
   (use --hidden to access hidden revisions)
-  [255]
+  [10]
   $ hg update --hidden 'desc(A0)'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   updated to hidden changeset 471f378eab4c
--- a/tests/test-evolve-obshistory-amend.t	Fri Oct 15 11:36:03 2021 +0300
+++ b/tests/test-evolve-obshistory-amend.t	Fri Oct 15 11:37:42 2021 +0300
@@ -205,7 +205,7 @@
   $ hg update 471f378eab4c
   abort: hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9
   (use --hidden to access hidden revisions)
-  [255]
+  [10]
   $ hg update --hidden "desc(A0)"
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to hidden changeset 471f378eab4c
--- a/tests/test-evolve-obshistory-content-divergent.t	Fri Oct 15 11:36:03 2021 +0300
+++ b/tests/test-evolve-obshistory-content-divergent.t	Fri Oct 15 11:37:42 2021 +0300
@@ -441,7 +441,7 @@
   $ hg update 471f378eab4c
   abort: hidden revision '471f378eab4c' has diverged
   (use --hidden to access hidden revisions)
-  [255]
+  [10]
   $ hg update --hidden 'desc(A0)'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to hidden changeset 471f378eab4c
--- a/tests/test-evolve-obshistory-fold.t	Fri Oct 15 11:36:03 2021 +0300
+++ b/tests/test-evolve-obshistory-fold.t	Fri Oct 15 11:37:42 2021 +0300
@@ -291,7 +291,7 @@
   $ hg update 471f378eab4c
   abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192
   (use --hidden to access hidden revisions)
-  [255]
+  [10]
   $ hg update --hidden 'desc(A0)'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   updated to hidden changeset 471f378eab4c
@@ -301,7 +301,7 @@
   $ hg update 0dec01379d3b
   abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192
   (use --hidden to access hidden revisions)
-  [255]
+  [10]
   $ hg update --hidden 'desc(B0)'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to hidden changeset 0dec01379d3b
--- a/tests/test-evolve-obshistory-lots-of-splits.t	Fri Oct 15 11:36:03 2021 +0300
+++ b/tests/test-evolve-obshistory-lots-of-splits.t	Fri Oct 15 11:37:42 2021 +0300
@@ -446,7 +446,7 @@
   $ hg update de7290d8b885
   abort: hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more
   (use --hidden to access hidden revisions)
-  [255]
+  [10]
   $ hg update --hidden 'min(desc(A0))'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to hidden changeset de7290d8b885
--- a/tests/test-evolve-obshistory-prune.t	Fri Oct 15 11:36:03 2021 +0300
+++ b/tests/test-evolve-obshistory-prune.t	Fri Oct 15 11:37:42 2021 +0300
@@ -107,7 +107,7 @@
   $ hg up 0dec01379d3b
   abort: hidden revision '0dec01379d3b' is pruned
   (use --hidden to access hidden revisions)
-  [255]
+  [10]
   $ hg up --hidden -r 'desc(B0)'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to hidden changeset 0dec01379d3b
--- a/tests/test-evolve-obshistory-split.t	Fri Oct 15 11:36:03 2021 +0300
+++ b/tests/test-evolve-obshistory-split.t	Fri Oct 15 11:37:42 2021 +0300
@@ -258,7 +258,7 @@
   $ hg update 471597cad322
   abort: hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a
   (use --hidden to access hidden revisions)
-  [255]
+  [10]
   $ hg update --hidden 'min(desc(A0))'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to hidden changeset 471597cad322
--- a/tests/test-prune.t	Fri Oct 15 11:36:03 2021 +0300
+++ b/tests/test-prune.t	Fri Oct 15 11:37:42 2021 +0300
@@ -306,7 +306,7 @@
   $ hg id -ir dcbb326fdec2
   abort: hidden revision 'dcbb326fdec2' is pruned
   (use --hidden to access hidden revisions)
-  [255]
+  [10]
   $ hg id -ir d62d843c9a01
   d62d843c9a01
   $ hg bookmarks
@@ -340,7 +340,7 @@
   $ hg id -ir 6:2702dd0c91e7
   abort: hidden revision '6' is pruned
   (use --hidden to access hidden revisions)
-  [255]
+  [10]
 
   $ hg debugobsstorestat
   markers total:                      7
--- a/tests/test-topic.t	Fri Oct 15 11:36:03 2021 +0300
+++ b/tests/test-topic.t	Fri Oct 15 11:37:42 2021 +0300
@@ -819,13 +819,13 @@
   9: fran
   $ tlog 'topic(nonsense)'
   abort: unknown revision 'nonsense'
-  [255]
+  [10]
 
 Pattern matching in topic() revset
   $ tlog 'topic("re:nonsense")'
   $ tlog 'topic("literal:nonsense")'
   abort: topic 'nonsense' does not exist
-  [255]
+  [10]
 
 Deactivate the topic.
   $ hg topics
--- a/tests/test-userguide.t	Fri Oct 15 11:36:03 2021 +0300
+++ b/tests/test-userguide.t	Fri Oct 15 11:37:42 2021 +0300
@@ -21,7 +21,7 @@
   saved backup bundle to $TESTTMP/t/.hg/strip-backup/6e725fd2be6f-42cc74d4-amend.hg (glob)
   $ hg log -r 23fe4ac6d3f1
   abort: unknown revision '23fe4ac6d3f1'
-  [255]
+  [10]
   $ hg identify -in
   fe0ecd3bd2a4 1
 
@@ -40,7 +40,7 @@
   $ hg shortlog -q -r fe0ecd3bd2a4
   abort: hidden revision 'fe0ecd3bd2a4' was rewritten as: 934359450037
   (use --hidden to access hidden revisions)
-  [255]
+  [10]
   $ hg --hidden shortlog -G
   @  2:934359450037  draft  implement feature Y
   |