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: suggest "hg update -C .", including '.', to abort evolve stable
authorMartin von Zweigbergk <martinvonz@google.com>
Fri, 28 Oct 2016 15:04:40 -0700
branchstable
changeset 1753 9fd15f27c91c
parent 1752 19e32420e150
child 1754 c9ddc93eee67
evolve: suggest "hg update -C .", including '.', to abort evolve The user will probably not also want to change commit when they abort evolve, like "hg update -C" (without the '.') would do. Note that we already do recommend aborting by using "hg update -C ." in another place.
README file | annotate | diff | comparison | revisions
hgext/evolve.py file | annotate | diff | comparison | revisions
tests/test-evolve.t file | annotate | diff | comparison | revisions
tests/test-stabilize-conflict.t file | annotate | diff | comparison | revisions
tests/test-stabilize-result.t file | annotate | diff | comparison | revisions 
--- a/README	Fri Oct 28 17:03:53 2016 +0200
+++ b/README	Fri Oct 28 15:04:40 2016 -0700
@@ -66,6 +66,7 @@
  - split: avoid crash on empty commit (issue5191),
  - next: improve locking to avoid issue with working copy parent (issue5244)
  - prev: improve locking to avoid issue with working copy parent (issue5244)
+ - evolve: fix abort suggestion to include '.' in 'hg update -C .'
 
 5.4.1 -- 2016-08-01
 
--- a/hgext/evolve.py	Fri Oct 28 17:03:53 2016 +0200
+++ b/hgext/evolve.py	Fri Oct 28 15:04:40 2016 -0700
@@ -1946,7 +1946,7 @@
             repo.ui.write_err(_('evolve failed!\n'))
             repo.ui.write_err(
                 _('fix conflict and run "hg evolve --continue"'
-                  ' or use "hg update -C" to abort\n'))
+                  ' or use "hg update -C ." to abort\n'))
             raise
 
 def _solvebumped(ui, repo, bumped, dryrun=False, confirm=False,
--- a/tests/test-evolve.t	Fri Oct 28 17:03:53 2016 +0200
+++ b/tests/test-evolve.t	Fri Oct 28 15:04:40 2016 -0700
@@ -1435,7 +1435,7 @@
   merging newfile
   warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark')
   evolve failed!
-  fix conflict and run "hg evolve --continue" or use "hg update -C" to abort
+  fix conflict and run "hg evolve --continue" or use "hg update -C ." to abort
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
--- a/tests/test-stabilize-conflict.t	Fri Oct 28 17:03:53 2016 +0200
+++ b/tests/test-stabilize-conflict.t	Fri Oct 28 15:04:40 2016 -0700
@@ -129,7 +129,7 @@
   merging babar
   warning: conflicts while merging babar! (edit, then use 'hg resolve --mark')
   evolve failed!
-  fix conflict and run "hg evolve --continue" or use "hg update -C" to abort
+  fix conflict and run "hg evolve --continue" or use "hg update -C ." to abort
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
   $ hg resolve -l
@@ -219,7 +219,7 @@
   was merge successful (yn)? n
   merging babar failed!
   evolve failed!
-  fix conflict and run "hg evolve --continue" or use "hg update -C" to abort
+  fix conflict and run "hg evolve --continue" or use "hg update -C ." to abort
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
   $ hg resolve -l
--- a/tests/test-stabilize-result.t	Fri Oct 28 17:03:53 2016 +0200
+++ b/tests/test-stabilize-result.t	Fri Oct 28 15:04:40 2016 -0700
@@ -84,7 +84,7 @@
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   evolve failed!
-  fix conflict and run "hg evolve --continue" or use "hg update -C" to abort
+  fix conflict and run "hg evolve --continue" or use "hg update -C ." to abort
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
   $ hg revert -r 'unstable()' a
evolve