Mercurial Mercurial > hg-stable / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-update-branches.out
changeset 9717 68a1b9d0663e
parent 9716 ea8c207a0f78 
--- a/tests/test-update-branches.out	Thu Nov 05 10:53:36 2009 +0100
+++ b/tests/test-update-branches.out	Thu Nov 05 10:53:59 2009 +0100
@@ -16,14 +16,14 @@
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 parent=5
 % norevtest none clean same 2
-abort: crosses branches (use 'hg merge' or 'hg update -C')
+abort: crosses branches (use 'hg merge' or use 'hg update -c')
 parent=2
 % revtest none clean linear 1 2
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 parent=2
 % revtest none clean same 2 3
-abort: crosses branches (use 'hg merge' or 'hg update -C')
-parent=2
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+parent=3
 % revtest none clean cross 3 4
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 parent=4
@@ -32,11 +32,11 @@
 parent=2
 M foo
 % revtest none dirty same 2 3
-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)
 parent=2
 M foo
 % revtest none dirty cross 3 4
-abort: crosses named branches (use 'hg update -C' to discard changes)
+abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)
 parent=3
 M foo
 % revtest -C dirty linear 1 2
hg-stable