equal
deleted
inserted
replaced
|
1 + mkdir t |
|
2 + cd t |
|
3 + hg init |
|
4 + echo This is file a1 |
|
5 + echo This is file b1 |
|
6 + hg add a b |
|
7 + hg commit -t 'commit #0' -d '0 0' -u user |
|
8 + echo This is file b22 |
|
9 + hg commit '-tcomment #1' -d '0 0' -u user |
|
10 + hg update 0 |
|
11 + rm b |
|
12 + hg commit -A '-tcomment #2' -d '0 0' -u user |
|
13 + yes k |
|
14 + hg update 1 |
|
15 this update spans a branch affecting the following files: |
|
16 aborting update spanning branches! |
|
17 (use update -m to perform a branch merge) |
|
18 + exit 0 |