Tell the user the real "hg update -C" command, not just "-C" when aborting.
authorThomas Arendsen Hein <thomas@intevation.de>
Sun, 02 Apr 2006 18:16:06 +0200
changeset 2038 5c4496ed152d
parent 2037 f90513a3dbcd
child 2039 0c438fd25e6e
Tell the user the real "hg update -C" command, not just "-C" when aborting.
mercurial/localrepo.py
tests/test-merge5.out
tests/test-up-local-change.out
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -1662,7 +1662,7 @@ class localrepository(object):
                     self.ui.status(" %s%s\n" % (f, cf))
                 self.ui.warn(_("aborting update spanning branches!\n"))
                 self.ui.status(_("(use 'hg merge' to merge across branches"
-                                 " or '-C' to lose changes)\n"))
+                                 " or 'hg update -C' to lose changes)\n"))
                 return 1
             branch_merge = True
 
--- a/tests/test-merge5.out
+++ b/tests/test-merge5.out
@@ -2,4 +2,4 @@ removing b
 this update spans a branch affecting the following files:
  b
 aborting update spanning branches!
-(use 'hg merge' to merge across branches or '-C' to lose changes)
+(use 'hg merge' to merge across branches or 'hg update -C' to lose changes)
--- a/tests/test-up-local-change.out
+++ b/tests/test-up-local-change.out
@@ -101,7 +101,7 @@ this update spans a branch affecting the
  a (resolve)
  b (resolve)
 aborting update spanning branches!
-(use 'hg merge' to merge across branches or '-C' to lose changes)
+(use 'hg merge' to merge across branches or 'hg update -C' to lose changes)
 failed
 abort: outstanding uncommitted changes
 failed