Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge5.out @ 808:8f5637f0a0c0
Merge with TAH
author | mpm@selenic.com |
---|---|
date | Sat, 30 Jul 2005 08:35:29 -0800 |
parents | 61ed30e82b27 1f9ec150a476 |
children | 0902ffece4b4 |
comparison
equal
deleted
inserted
replaced
788:64d2a558c943 | 808:8f5637f0a0c0 |
---|---|
1 + mkdir t | |
2 + cd t | |
3 + hg init | 1 + hg init |
4 + echo This is file a1 | |
5 + echo This is file b1 | |
6 + hg add a b | 2 + hg add a b |
7 + hg commit -m 'commit #0' -d '0 0' | 3 + hg commit -m commit #0 -d 0 0 |
8 + echo This is file b22 | 4 + hg commit -mcomment #1 -d 0 0 |
9 + hg commit '-mcomment #1' -d '0 0' | |
10 + hg update 0 | 5 + hg update 0 |
11 + rm b | 6 + hg commit -A -mcomment #2 -d 0 0 |
12 + hg commit -A '-mcomment #2' -d '0 0' | |
13 removing b | 7 removing b |
14 + yes k | |
15 + hg update 1 | 8 + hg update 1 |
16 this update spans a branch affecting the following files: | 9 this update spans a branch affecting the following files: |
17 b | 10 b |
18 aborting update spanning branches! | 11 aborting update spanning branches! |
19 (use update -m to perform a branch merge) | 12 (use update -m to perform a branch merge) |
20 + exit 0 |