##// END OF EJS Templates
Fix up tests for new branch message
Brendan Cully -
r4602:d9d177ef default
parent child Browse files
Show More
@@ -13,6 +13,7 b" abort: decoding near ' encoded: \xe9': 'ascii' codec can't decode byte 0xe9 in position 20: ordinal not in range(128)!"
13 transaction abort!
13 transaction abort!
14 rollback completed
14 rollback completed
15 % these should work
15 % these should work
16 marked working directory as branch �
16 % ascii
17 % ascii
17 changeset: 5:db5520b4645f
18 changeset: 5:db5520b4645f
18 branch: ?
19 branch: ?
@@ -1,3 +1,4 b''
1 marked working directory as branch abranch
1 applying patch from stdin
2 applying patch from stdin
2 applying patch from stdin
3 applying patch from stdin
3 applying patch from stdin
4 applying patch from stdin
@@ -1,6 +1,9 b''
1 marked working directory as branch foo
1 foo
2 foo
3 marked working directory as branch bar
2 % branch shadowing
4 % branch shadowing
3 abort: a branch of the same name already exists (use --force to override)
5 abort: a branch of the same name already exists (use --force to override)
6 marked working directory as branch default
4 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
7 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
5 foo
8 foo
6 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
9 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -83,8 +86,10 b' 67ec16bde7f1575d523313b9bca000f6a6f12dca'
83 % update with no arguments: tipmost revision of the current branch
86 % update with no arguments: tipmost revision of the current branch
84 bf1bc2f45e83
87 bf1bc2f45e83
85 4909a3732169 (foo) tip
88 4909a3732169 (foo) tip
89 marked working directory as branch foobar
86 abort: branch foobar not found
90 abort: branch foobar not found
87 % fastforward merge
91 % fastforward merge
92 marked working directory as branch ff
88 adding ff
93 adding ff
89 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
94 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
90 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
95 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
General Comments 0
You need to be logged in to leave comments. Login now