[PATCH] update: when failing to merge, mention how to abandon the update (issue1431)

[Brodie Rao]

# HG changeset patch
# User Brodie Rao <brodie at bitheap.org>
# Date 1298181399 28800
# Node ID a8fc9b1309a82eaea2a0454809678c8d53df9d48
# Parent  643b8212813e631b5525049fc4321a34a4def105
update: when failing to merge, mention how to abandon the update (issue1431)

Prior to the resolve command being added in 92ccccb55ba3, hg update
printed a similar message explaining how to retry the update.

diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -378,10 +378,12 @@ def _showstats(repo, stats):
 
 def update(repo, node):
     """update the working directory to node, merging linear changes"""
+    pl = repo.parents()
     stats = mergemod.update(repo, node, False, False, None)
     _showstats(repo, stats)
     if stats[3]:
-        repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n"))
+        repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
+                         "or 'hg update %s' to abandon\n") % pl[0].rev())
     return stats[3] > 0
 
 # naming conflict in clone()
diff --git a/tests/test-merge-local.t b/tests/test-merge-local.t
--- a/tests/test-merge-local.t
+++ b/tests/test-merge-local.t
@@ -56,7 +56,7 @@ Local merge with bad merge tool:
   merging zzz2_merge_bad
   merging zzz2_merge_bad failed!
   3 files updated, 1 files merged, 2 files removed, 1 files unresolved
-  use 'hg resolve' to retry unresolved file merges
+  use 'hg resolve' to retry unresolved file merges or 'hg update 0' to abandon
   [1]
 
   $ hg co 0
@@ -65,7 +65,7 @@ Local merge with bad merge tool:
   warning: conflicts during merge.
   merging zzz2_merge_bad failed!
   2 files updated, 1 files merged, 3 files removed, 1 files unresolved
-  use 'hg resolve' to retry unresolved file merges
+  use 'hg resolve' to retry unresolved file merges or 'hg update 1' to abandon
   [1]
 
   $ hg diff --nodates | grep "^[+-][^<>]"
@@ -90,7 +90,7 @@ Local merge with conflicts:
   warning: conflicts during merge.
   merging zzz2_merge_bad failed!
   3 files updated, 1 files merged, 2 files removed, 1 files unresolved
-  use 'hg resolve' to retry unresolved file merges
+  use 'hg resolve' to retry unresolved file merges or 'hg update 0' to abandon
   [1]
 
   $ hg co 0
@@ -99,7 +99,7 @@ Local merge with conflicts:
   warning: conflicts during merge.
   merging zzz2_merge_bad failed!
   2 files updated, 1 files merged, 3 files removed, 1 files unresolved
-  use 'hg resolve' to retry unresolved file merges
+  use 'hg resolve' to retry unresolved file merges or 'hg update 1' to abandon
   [1]
 
   $ hg diff --nodates | grep "^[+-][^<>]"
diff --git a/tests/test-merge-revert2.t b/tests/test-merge-revert2.t
--- a/tests/test-merge-revert2.t
+++ b/tests/test-merge-revert2.t
@@ -47,7 +47,7 @@
   warning: conflicts during merge.
   merging file1 failed!
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  use 'hg resolve' to retry unresolved file merges
+  use 'hg resolve' to retry unresolved file merges or 'hg update 0' to abandon
   [1]
 
   $ hg diff --nodates
diff --git a/tests/test-update-renames.t b/tests/test-update-renames.t
--- a/tests/test-update-renames.t
+++ b/tests/test-update-renames.t
@@ -23,7 +23,7 @@ Update with local changes across a file 
   warning: conflicts during merge.
   merging b failed!
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  use 'hg resolve' to retry unresolved file merges
+  use 'hg resolve' to retry unresolved file merges or 'hg update 0' to abandon
   [1]
 
   $ cd ..