test-merge5.out
20 lines
| 422 B
| text/plain
|
TextLexer
/ tests / test-merge5.out
|
r415 | + mkdir t | ||
+ cd t | ||||
+ hg init | ||||
+ echo This is file a1 | ||||
+ echo This is file b1 | ||||
+ hg add a b | ||||
|
r749 | + hg commit -m 'commit #0' -d '0 0' | ||
|
r415 | + echo This is file b22 | ||
|
r749 | + hg commit '-mcomment #1' -d '0 0' | ||
|
r415 | + hg update 0 | ||
+ rm b | ||||
|
r749 | + hg commit -A '-mcomment #2' -d '0 0' | ||
|
r767 | removing b | ||
|
r415 | + yes k | ||
+ hg update 1 | ||||
this update spans a branch affecting the following files: | ||||
|
r616 | b | ||
|
r415 | aborting update spanning branches! | ||
(use update -m to perform a branch merge) | ||||
+ exit 0 | ||||