Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: fix typo: -list -> --list stable
authorKyle Lippincott <spectral@google.com>
Tue, 06 Jun 2017 15:10:13 -0700
branchstable
changeset 2546 abe6dfbdc744
parent 2545 cb0d62ed5e2a
child 2547 3c594000844b
evolve: fix typo: -list -> --list
hgext3rd/evolve/__init__.py file | annotate | diff | comparison | revisions
tests/test-evolve-obshistory.t file | annotate | diff | comparison | revisions
tests/test-evolve-templates.t file | annotate | diff | comparison | revisions
tests/test-obsolete.t file | annotate | diff | comparison | revisions
tests/test-uncommit.t file | annotate | diff | comparison | revisions 
--- a/hgext3rd/evolve/__init__.py	Thu Jun 01 16:26:00 2017 +0200
+++ b/hgext3rd/evolve/__init__.py	Tue Jun 06 15:10:13 2017 -0700
@@ -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':
--- a/tests/test-evolve-obshistory.t	Thu Jun 01 16:26:00 2017 +0200
+++ b/tests/test-evolve-obshistory.t	Tue Jun 06 15:10:13 2017 -0700
@@ -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
 ========================================
--- a/tests/test-evolve-templates.t	Thu Jun 01 16:26:00 2017 +0200
+++ b/tests/test-evolve-templates.t	Tue Jun 06 15:10:13 2017 -0700
@@ -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
--- a/tests/test-obsolete.t	Thu Jun 01 16:26:00 2017 +0200
+++ b/tests/test-obsolete.t	Tue Jun 06 15:10:13 2017 -0700
@@ -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
--- a/tests/test-uncommit.t	Thu Jun 01 16:26:00 2017 +0200
+++ b/tests/test-uncommit.t	Tue Jun 06 15:10:13 2017 -0700
@@ -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
evolve