Mercurial > hg > evolve
changeset 2642:abe6dfbdc744 stable
evolve: fix typo: -list -> --list
| author | Kyle Lippincott <spectral@google.com> |
|---|---|
| date | Tue, 06 Jun 2017 15:10:13 -0700 |
| parents | cb0d62ed5e2a |
| children | 3c594000844b |
| files | hgext3rd/evolve/__init__.py tests/test-evolve-obshistory.t tests/test-evolve-templates.t tests/test-obsolete.t tests/test-uncommit.t |
| diffstat | 5 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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':
--- 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 ========================================
--- 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
--- 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
--- 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