Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge6.out @ 793:445970ccf57a
Merge with upstream
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 29 Jul 2005 06:43:21 +0100 |
parents | 7e4843b7efd2 122449dd89db |
children | 1f9ec150a476 |
rev | line source |
---|---|
616 | 1 + cat |
2 + chmod +x merge | |
3 + export HGMERGE=./merge | |
4 + HGMERGE=./merge | |
5 + mkdir A1 | |
6 + cd A1 | |
7 + hg init | |
8 + echo This is file foo1 | |
9 + echo This is file bar1 | |
10 + hg add foo bar | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
676
diff
changeset
|
11 + hg commit -m 'commit text' -d '0 0' |
616 | 12 + cd .. |
13 + hg clone A1 B1 | |
14 + cd A1 | |
15 + rm bar | |
16 + hg remove bar | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
676
diff
changeset
|
17 + hg commit -m 'commit test' -d '0 0' |
616 | 18 + cd ../B1 |
19 + echo This is file foo22 | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
676
diff
changeset
|
20 + hg commit -m 'commit test' -d '0 0' |
616 | 21 + cd .. |
22 + hg clone A1 A2 | |
23 + hg clone B1 B2 | |
24 + cd A1 | |
25 + hg pull ../B1 | |
26 pulling from ../B1 | |
27 searching for changes | |
28 adding changesets | |
29 adding manifests | |
775 | 30 adding file changes |
31 added 1 changesets with 1 changes to 1 files | |
616 | 32 (run 'hg update' to get a working copy) |
33 + hg update -m | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
676
diff
changeset
|
34 + hg commit -m 'commit test' -d '0 0' |
616 | 35 + echo bar should remain deleted. |
36 bar should remain deleted. | |
37 + hg manifest | |
38 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo | |
39 + cd ../B2 | |
40 + hg pull ../A2 | |
41 pulling from ../A2 | |
42 searching for changes | |
43 adding changesets | |
44 adding manifests | |
775 | 45 adding file changes |
46 added 1 changesets with 0 changes to 0 files | |
616 | 47 (run 'hg update' to get a working copy) |
48 + hg update -m | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
676
diff
changeset
|
49 + hg commit -m 'commit test' -d '0 0' |
616 | 50 + echo bar should remain deleted. |
51 bar should remain deleted. | |
52 + hg manifest | |
53 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo |