Mercurial > hg > pyhgsh

changeset 2038:5c4496ed152d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tell the user the real "hg update -C" command, not just "-C" when aborting.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 02 Apr 2006 18:16:06 +0200
parents f90513a3dbcd
children 0c438fd25e6e
files mercurial/localrepo.py tests/test-merge5.out tests/test-up-local-change.out
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/localrepo.py	Sun Apr 02 08:19:41 2006 +0200
+++ b/mercurial/localrepo.py	Sun Apr 02 18:16:06 2006 +0200
@@ -1662,7 +1662,7 @@
                     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	Sun Apr 02 08:19:41 2006 +0200
+++ b/tests/test-merge5.out	Sun Apr 02 18:16:06 2006 +0200
@@ -2,4 +2,4 @@
 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	Sun Apr 02 08:19:41 2006 +0200
+++ b/tests/test-up-local-change.out	Sun Apr 02 18:16:06 2006 +0200
@@ -101,7 +101,7 @@
  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