Show More
| @@ -1,45 +1,69 b'' | |||||
| 1 | #!/bin/sh |
|
1 | $ cat <<EOF > merge | |
|
|
2 | > import sys, os | |||
|
|
3 | > print "merging for", os.path.basename(sys.argv[1]) | |||
|
|
4 | > EOF | |||
|
|
5 | $ HGMERGE="python ../merge"; export HGMERGE | |||
| 2 |
|
6 | |||
| 3 | cat <<EOF > merge |
|
7 | $ mkdir A1 | |
| 4 | import sys, os |
|
8 | $ cd A1 | |
| 5 | print "merging for", os.path.basename(sys.argv[1]) |
|
9 | $ hg init | |
| 6 | EOF |
|
10 | $ echo This is file foo1 > foo | |
| 7 | HGMERGE="python ../merge"; export HGMERGE |
|
11 | $ echo This is file bar1 > bar | |
|
|
12 | $ hg add foo bar | |||
|
|
13 | $ hg commit -m "commit text" -d "1000000 0" | |||
| 8 |
|
14 | |||
| 9 | mkdir A1 |
|
15 | $ cd .. | |
| 10 | cd A1 |
|
16 | $ hg clone A1 B1 | |
| 11 | hg init |
|
17 | updating to branch default | |
| 12 | echo This is file foo1 > foo |
|
18 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 13 | echo This is file bar1 > bar |
|
|||
| 14 | hg add foo bar |
|
|||
| 15 | hg commit -m "commit text" -d "1000000 0" |
|
|||
| 16 |
|
19 | |||
| 17 | cd .. |
|
20 | $ cd A1 | |
| 18 | hg clone A1 B1 |
|
21 | $ rm bar | |
|
|
22 | $ hg remove bar | |||
|
|
23 | $ hg commit -m "commit test" -d "1000000 0" | |||
|
|
24 | ||||
|
|
25 | $ cd ../B1 | |||
|
|
26 | $ echo This is file foo22 > foo | |||
|
|
27 | $ hg commit -m "commit test" -d "1000000 0" | |||
| 19 |
|
28 | |||
| 20 | cd A1 |
|
29 | $ cd .. | |
| 21 | rm bar |
|
30 | $ hg clone A1 A2 | |
| 22 | hg remove bar |
|
31 | updating to branch default | |
| 23 | hg commit -m "commit test" -d "1000000 0" |
|
32 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 24 |
|
33 | $ hg clone B1 B2 | ||
| 25 | cd ../B1 |
|
34 | updating to branch default | |
| 26 | echo This is file foo22 > foo |
|
35 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 27 | hg commit -m "commit test" -d "1000000 0" |
|
|||
| 28 |
|
||||
| 29 | cd .. |
|
|||
| 30 | hg clone A1 A2 |
|
|||
| 31 | hg clone B1 B2 |
|
|||
| 32 |
|
36 | |||
| 33 | cd A1 |
|
37 | $ cd A1 | |
| 34 | hg pull ../B1 |
|
38 | $ hg pull ../B1 | |
| 35 | hg merge |
|
39 | pulling from ../B1 | |
| 36 | hg commit -m "commit test" -d "1000000 0" |
|
40 | searching for changes | |
| 37 | echo bar should remain deleted. |
|
41 | adding changesets | |
| 38 | hg manifest --debug |
|
42 | adding manifests | |
|
|
43 | adding file changes | |||
|
|
44 | added 1 changesets with 1 changes to 1 files (+1 heads) | |||
|
|
45 | (run 'hg heads' to see heads, 'hg merge' to merge) | |||
|
|
46 | $ hg merge | |||
|
|
47 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
|
48 | (branch merge, don't forget to commit) | |||
|
|
49 | $ hg commit -m "commit test" -d "1000000 0" | |||
|
|
50 | bar should remain deleted. | |||
|
|
51 | $ hg manifest --debug | |||
|
|
52 | f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo | |||
| 39 |
|
53 | |||
| 40 | cd ../B2 |
|
54 | $ cd ../B2 | |
| 41 | hg pull ../A2 |
|
55 | $ hg pull ../A2 | |
| 42 | hg merge |
|
56 | pulling from ../A2 | |
| 43 | hg commit -m "commit test" -d "1000000 0" |
|
57 | searching for changes | |
| 44 | echo bar should remain deleted. |
|
58 | adding changesets | |
| 45 | hg manifest --debug |
|
59 | adding manifests | |
|
|
60 | adding file changes | |||
|
|
61 | added 1 changesets with 0 changes to 0 files (+1 heads) | |||
|
|
62 | (run 'hg heads' to see heads, 'hg merge' to merge) | |||
|
|
63 | $ hg merge | |||
|
|
64 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
|
65 | (branch merge, don't forget to commit) | |||
|
|
66 | $ hg commit -m "commit test" -d "1000000 0" | |||
|
|
67 | bar should remain deleted. | |||
|
|
68 | $ hg manifest --debug | |||
|
|
69 | f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo | |||
| 1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
General Comments 0
You need to be logged in to leave comments.
Login now