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