[PATCH evolve-ext] evolve: fix typo: -list -> --list
Kyle Lippincott
spectral at google.com
Tue Jun 6 22:34:47 UTC 2017
# HG changeset patch
# User Kyle Lippincott <spectral at google.com>
# Date 1496787013 25200
# Tue Jun 06 15:10:13 2017 -0700
# Node ID ff53569086ad8e729e2c43346a27c91efcefceca
# Parent 3e62042a6bb76c01c71685e24b8900b8c502c598
evolve: fix typo: -list -> --list
diff --git a/hgext3rd/evolve/__init__.py b/hgext3rd/evolve/__init__.py
--- a/hgext3rd/evolve/__init__.py
+++ b/hgext3rd/evolve/__init__.py
@@ -576,7 +576,7 @@
if reason == 'pruned':
solvemsg = _("use 'hg evolve' to update to its parent successor")
elif reason == 'diverged':
- debugcommand = "hg evolve -list --divergent"
+ debugcommand = "hg evolve --list --divergent"
basemsg = _("%s has diverged, use '%s' to resolve the issue")
solvemsg = basemsg % (shortnode, debugcommand)
elif reason == 'superseed':
diff --git a/tests/test-evolve-obshistory.t b/tests/test-evolve-obshistory.t
--- a/tests/test-evolve-obshistory.t
+++ b/tests/test-evolve-obshistory.t
@@ -1035,7 +1035,7 @@
$ hg update --hidden 'desc(A0)'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory parent is obsolete! (471f378eab4c)
- (471f378eab4c has diverged, use 'hg evolve -list --divergent' to resolve the issue)
+ (471f378eab4c has diverged, use 'hg evolve --list --divergent' to resolve the issue)
Test output with amended + folded commit
========================================
diff --git a/tests/test-evolve-templates.t b/tests/test-evolve-templates.t
--- a/tests/test-evolve-templates.t
+++ b/tests/test-evolve-templates.t
@@ -464,7 +464,7 @@
$ hg up 'desc(A0)' --hidden
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory parent is obsolete! (471f378eab4c)
- (471f378eab4c has diverged, use 'hg evolve -list --divergent' to resolve the issue)
+ (471f378eab4c has diverged, use 'hg evolve --list --divergent' to resolve the issue)
Precursors template should show current revision as it is the working copy
$ hg tlog
diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -705,7 +705,7 @@
$ hg up --hidden 2
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory parent is obsolete! (4538525df7e2)
- (4538525df7e2 has diverged, use 'hg evolve -list --divergent' to resolve the issue)
+ (4538525df7e2 has diverged, use 'hg evolve --list --divergent' to resolve the issue)
$ hg export 9468a5f5d8b2 | hg import -
applying patch from stdin
1 new unstable changesets
diff --git a/tests/test-uncommit.t b/tests/test-uncommit.t
--- a/tests/test-uncommit.t
+++ b/tests/test-uncommit.t
@@ -286,7 +286,7 @@
$ hg up -C 3 --hidden
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory parent is obsolete! (5eb72dbe0cb4)
- (5eb72dbe0cb4 has diverged, use 'hg evolve -list --divergent' to resolve the issue)
+ (5eb72dbe0cb4 has diverged, use 'hg evolve --list --divergent' to resolve the issue)
$ hg --config extensions.purge= purge
$ hg uncommit --all -X e
1 new divergent changesets
More information about the Mercurial-devel
mailing list