Patchwork [1,of,3,evolve-ext] evolve: prefer "abort" over "abandon" in messages for consistency

login
register
mail settings
Submitter via Mercurial-devel
Date Oct. 29, 2016, 12:27 a.m.
Message ID <21e8cc0e6fafd8d11e63.1477700836@martinvonz.mtv.corp.google.com>
Download mbox | patch
Permalink /patch/17220/
State Accepted
Headers show

Comments

via Mercurial-devel - Oct. 29, 2016, 12:27 a.m.
# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1477699903 25200
#      Fri Oct 28 17:11:43 2016 -0700
# Branch stable
# Node ID 21e8cc0e6fafd8d11e63e745f1667c40a262b8df
# Parent  c9ddc93eee67de7787133c725971e9bc108c3e93
evolve: prefer "abort" over "abandon" in messages for consistency

Patch

diff -r c9ddc93eee67 -r 21e8cc0e6faf hgext/evolve.py
--- a/hgext/evolve.py	Fri Oct 28 15:17:27 2016 -0700
+++ b/hgext/evolve.py	Fri Oct 28 17:11:43 2016 -0700
@@ -2148,7 +2148,7 @@ 
     hg._showstats(repo, stats)
     if stats[3]:
         repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
-                         "or 'hg update -C .' to abandon\n"))
+                         "or 'hg update -C .' to abort\n"))
     if stats[3] > 0:
         raise error.Abort('merge conflict between several amendments '
             '(this is not automated yet)',
diff -r c9ddc93eee67 -r 21e8cc0e6faf tests/test-stabilize-result.t
--- a/tests/test-stabilize-result.t	Fri Oct 28 15:17:27 2016 -0700
+++ b/tests/test-stabilize-result.t	Fri Oct 28 17:11:43 2016 -0700
@@ -359,7 +359,7 @@ 
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
+  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abort
   abort: merge conflict between several amendments (this is not automated yet)
   (/!\ You can try:
   /!\ * manual merge + resolve => new cset X