Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge6.out @ 808:8f5637f0a0c0
Merge with TAH
author | mpm@selenic.com |
---|---|
date | Sat, 30 Jul 2005 08:35:29 -0800 |
parents | 122449dd89db 1f9ec150a476 |
children | 0902ffece4b4 |
comparison
equal
deleted
inserted
replaced
788:64d2a558c943 | 808:8f5637f0a0c0 |
---|---|
1 + cat | |
2 + chmod +x merge | |
3 + export HGMERGE=./merge | |
4 + HGMERGE=./merge | |
5 + mkdir A1 | |
6 + cd A1 | |
7 + hg init | 1 + hg init |
8 + echo This is file foo1 | |
9 + echo This is file bar1 | |
10 + hg add foo bar | 2 + hg add foo bar |
11 + hg commit -m 'commit text' -d '0 0' | 3 + hg commit -m commit text -d 0 0 |
12 + cd .. | |
13 + hg clone A1 B1 | 4 + hg clone A1 B1 |
14 + cd A1 | |
15 + rm bar | |
16 + hg remove bar | 5 + hg remove bar |
17 + hg commit -m 'commit test' -d '0 0' | 6 + hg commit -m commit test -d 0 0 |
18 + cd ../B1 | 7 + hg commit -m commit test -d 0 0 |
19 + echo This is file foo22 | |
20 + hg commit -m 'commit test' -d '0 0' | |
21 + cd .. | |
22 + hg clone A1 A2 | 8 + hg clone A1 A2 |
23 + hg clone B1 B2 | 9 + hg clone B1 B2 |
24 + cd A1 | |
25 + hg pull ../B1 | 10 + hg pull ../B1 |
26 pulling from ../B1 | 11 pulling from ../B1 |
27 searching for changes | 12 searching for changes |
28 adding changesets | 13 adding changesets |
29 adding manifests | 14 adding manifests |
30 adding file changes | 15 adding file changes |
31 added 1 changesets with 1 changes to 1 files | 16 added 1 changesets with 1 changes to 1 files |
32 (run 'hg update' to get a working copy) | 17 (run 'hg update' to get a working copy) |
33 + hg update -m | 18 + hg update -m |
34 + hg commit -m 'commit test' -d '0 0' | 19 + hg commit -m commit test -d 0 0 |
35 + echo bar should remain deleted. | |
36 bar should remain deleted. | 20 bar should remain deleted. |
37 + hg manifest | 21 + hg manifest |
38 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo | 22 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo |
39 + cd ../B2 | |
40 + hg pull ../A2 | 23 + hg pull ../A2 |
41 pulling from ../A2 | 24 pulling from ../A2 |
42 searching for changes | 25 searching for changes |
43 adding changesets | 26 adding changesets |
44 adding manifests | 27 adding manifests |
45 adding file changes | 28 adding file changes |
46 added 1 changesets with 0 changes to 0 files | 29 added 1 changesets with 0 changes to 0 files |
47 (run 'hg update' to get a working copy) | 30 (run 'hg update' to get a working copy) |
48 + hg update -m | 31 + hg update -m |
49 + hg commit -m 'commit test' -d '0 0' | 32 + hg commit -m commit test -d 0 0 |
50 + echo bar should remain deleted. | |
51 bar should remain deleted. | 33 bar should remain deleted. |
52 + hg manifest | 34 + hg manifest |
53 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo | 35 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo |