Show More
@@ -131,11 +131,14 b' def manifestmerge(repo, p1, p2, pa, over' | |||
|
131 | 131 | |
|
132 | 132 | m1 = p1.manifest() |
|
133 | 133 | m2 = p2.manifest() |
|
134 | ma = pa.manifest() | |
|
135 | 134 | backwards = (pa == p2) |
|
136 | 135 | |
|
137 |
if |
|
|
136 | if overwrite: | |
|
138 | 137 | ma = m1 |
|
138 | elif backwards: | |
|
139 | ma = p1.p1().manifest() | |
|
140 | else: | |
|
141 | ma = pa.manifest() | |
|
139 | 142 | |
|
140 | 143 | action = [] |
|
141 | 144 | copy, copied, diverge = {}, {}, {} |
@@ -43,7 +43,7 b' hg cat stuff.txt' | |||
|
43 | 43 | |
|
44 | 44 | echo '% Fresh checkout:' |
|
45 | 45 | rm stuff.txt |
|
46 | hg up | |
|
46 | hg up -C | |
|
47 | 47 | cat stuff.txt |
|
48 | 48 | echo >> stuff.txt <<EOF |
|
49 | 49 | Very very carefully. |
@@ -28,7 +28,7 b' echo %% uncompress our working dir copy' | |||
|
28 | 28 | gunzip < a.gz |
|
29 | 29 | |
|
30 | 30 | rm a.gz |
|
31 | hg co | |
|
31 | hg co -C | |
|
32 | 32 | |
|
33 | 33 | echo %% uncompress our new working dir copy |
|
34 | 34 | gunzip < a.gz |
@@ -3,6 +3,6 b' 79abf14474dc tip' | |||
|
3 | 3 | % make sure we notice the change of mode if the cached size == -1 |
|
4 | 4 | n 0 -1 unset a |
|
5 | 5 | M a |
|
6 |
|
|
|
6 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
7 | 7 | d69afc33ff8a |
|
8 | 8 | not executable -- whew |
@@ -117,7 +117,7 b' hg status' | |||
|
117 | 117 | |
|
118 | 118 | rm sym a b |
|
119 | 119 | echo % update |
|
120 | hg update | |
|
120 | hg update -C | |
|
121 | 121 | echo % cat |
|
122 | 122 | cat a b |
|
123 | 123 |
@@ -22,7 +22,9 b' merging zzz2_merge_bad' | |||
|
22 | 22 | merging zzz2_merge_bad failed! |
|
23 | 23 | 3 files updated, 1 files merged, 2 files removed, 1 files unresolved |
|
24 | 24 | use 'hg resolve' to retry unresolved file merges |
|
25 | 2 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
|
25 | merging zzz1_merge_ok | |
|
26 | merging zzz2_merge_bad | |
|
27 | 2 files updated, 2 files merged, 3 files removed, 0 files unresolved | |
|
26 | 28 | --- a/zzz1_merge_ok |
|
27 | 29 | +++ b/zzz1_merge_ok |
|
28 | 30 | +new first line |
@@ -32,7 +34,6 b' 2 files updated, 0 files merged, 3 files' | |||
|
32 | 34 | +another last line |
|
33 | 35 | M zzz1_merge_ok |
|
34 | 36 | M zzz2_merge_bad |
|
35 | ? zzz2_merge_bad.orig | |
|
36 | 37 | # local merge with conflicts |
|
37 | 38 | merging zzz1_merge_ok |
|
38 | 39 | merging zzz2_merge_bad |
@@ -40,7 +41,9 b' warning: conflicts during merge.' | |||
|
40 | 41 | merging zzz2_merge_bad failed! |
|
41 | 42 | 3 files updated, 1 files merged, 2 files removed, 1 files unresolved |
|
42 | 43 | use 'hg resolve' to retry unresolved file merges |
|
43 | 2 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
|
44 | merging zzz1_merge_ok | |
|
45 | merging zzz2_merge_bad | |
|
46 | 2 files updated, 2 files merged, 3 files removed, 0 files unresolved | |
|
44 | 47 | --- a/zzz1_merge_ok |
|
45 | 48 | +++ b/zzz1_merge_ok |
|
46 | 49 | +new first line |
@@ -52,7 +55,6 b' 2 files updated, 0 files merged, 3 files' | |||
|
52 | 55 | +new last line |
|
53 | 56 | M zzz1_merge_ok |
|
54 | 57 | M zzz2_merge_bad |
|
55 | ? zzz2_merge_bad.orig | |
|
56 | 58 | # local merge without conflicts |
|
57 | 59 | merging zzz1_merge_ok |
|
58 | 60 | 4 files updated, 1 files merged, 2 files removed, 0 files unresolved |
@@ -38,9 +38,15 b' summary: 2' | |||
|
38 | 38 | resolving manifests |
|
39 | 39 | overwrite False partial False |
|
40 | 40 | ancestor 33aaa84a386b local 802f095af299+ remote 33aaa84a386b |
|
41 | a: versions differ -> m | |
|
41 | 42 | b: other deleted -> r |
|
43 | preserving a for resolve of a | |
|
42 | 44 | removing b |
|
43 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
45 | picked tool 'true' for a (binary False symlink False) | |
|
46 | merging a | |
|
47 | my a@802f095af299+ other a@33aaa84a386b ancestor a@33aaa84a386b | |
|
48 | premerge successful | |
|
49 | 0 files updated, 1 files merged, 1 files removed, 0 files unresolved | |
|
44 | 50 | changeset: 0:33aaa84a386b |
|
45 | 51 | user: test |
|
46 | 52 | date: Mon Jan 12 13:46:40 1970 +0000 |
@@ -117,7 +117,7 b' cat .hg/hgrc' | |||
|
117 | 117 | echo |
|
118 | 118 | |
|
119 | 119 | rm f3 f4.bat bin |
|
120 | hg co 2>&1 | python -c 'import sys, os; sys.stdout.write(sys.stdin.read().replace(os.getcwd(), "...."))' | |
|
120 | hg co -C 2>&1 | python -c 'import sys, os; sys.stdout.write(sys.stdin.read().replace(os.getcwd(), "...."))' | |
|
121 | 121 | python print.py < bin |
|
122 | 122 | python print.py < f3 |
|
123 | 123 | python print.py < f4.bat |
@@ -152,7 +152,7 b' cat .hg/hgrc' | |||
|
152 | 152 | echo |
|
153 | 153 | |
|
154 | 154 | rm f3 f4.bat bin |
|
155 | hg co 2>&1 | python -c 'import sys, os; sys.stdout.write(sys.stdin.read().replace(os.getcwd(), "...."))' | |
|
155 | hg co -C 2>&1 | python -c 'import sys, os; sys.stdout.write(sys.stdin.read().replace(os.getcwd(), "...."))' | |
|
156 | 156 | python print.py < bin |
|
157 | 157 | python print.py < f3 |
|
158 | 158 | python print.py < f4.bat |
General Comments 0
You need to be logged in to leave comments.
Login now