Mercurial > hg

diff tests/test-up-local-change.out @ 9717:68a1b9d0663e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: allow branch crossing without -c or -C, with no uncommitted changes Update will now allow crossing branches within the same named branch, when given a specific revision, if the working dir is clean, without requiring the -c or -C option. Abort if no revision is given and this would cross branches. Minor change to abort message if uncommitted changes are found. Modify test-update-branches and output to reflect the altered case. Modify test-merge5.out to reflect the altered case. Modify test-up-local-change.out with new message.
author Stuart W Marks <smarks@smarks.org>
date Thu, 05 Nov 2009 10:53:59 +0100
parents a3d73b3e1f8a
children ba5e508b5e92
line wrap: on
line diff
--- a/tests/test-up-local-change.out	Thu Nov 05 10:53:36 2009 +0100
+++ b/tests/test-up-local-change.out	Thu Nov 05 10:53:59 2009 +0100
@@ -111,7 +111,7 @@
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     2
 
-abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes)
+abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)
 failed
 abort: outstanding uncommitted changes (use 'hg status' to list changes)
 failed