--- a/tests/test-update-branches.t Wed Feb 03 15:21:11 2016 +0000
+++ b/tests/test-update-branches.t Tue Feb 02 15:24:11 2016 +0000
@@ -93,8 +93,8 @@
parent=5
$ norevtest 'none clean same' clean 2
- abort: not a linear update
- (merge or update --check to force update)
+ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 1 other heads for branch "default"
parent=2
@@ -140,8 +140,8 @@
M foo
$ norevtest 'none dirty cross' dirty 2
- abort: uncommitted changes
- (commit and merge, or update --clean to discard changes)
+ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 1 other heads for branch "default"
parent=2
M foo
@@ -166,9 +166,9 @@
M sub/suba
$ norevtest '-c clean same' clean 2 -c
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 other heads for branch "default"
- parent=3
+ parent=2
$ revtest '-cC dirty linear' dirty 1 2 -cC
abort: cannot specify both -c/--check and -C/--clean