Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-rename-merge2.out @ 3317:966632304dde
merge: shortcircuit filemerge for identical files
- use filectx.cmp to compare files
- move merge messages into filemerge
- kill the redundant resolving message
- update tests
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 10 Oct 2006 01:16:06 -0500 |
parents | ecc1bf27378c |
children | b16456909a0a |
rev | line source |
---|---|
3280 | 1 -------------- |
2 test L:up a R:nc a b W: - 1 get local a to b | |
3 -------------- | |
4 resolving manifests | |
5 overwrite None branchmerge True partial False | |
6 ancestor e300d1c794ec local 735846fee2d7 remote 924404dff337 | |
7 rev: versions differ -> m | |
3314
ecc1bf27378c
merge: unify merge and copy actions
Matt Mackall <mpm@selenic.com>
parents:
3305
diff
changeset
|
8 a: remote copied -> m |
3317
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3314
diff
changeset
|
9 merging a and b |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
10 my a@. other b@735846fee2d7 ancestor a@924404dff337 |
3280 | 11 copying a to b |
12 merging rev | |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
13 my rev@. other rev@735846fee2d7 ancestor rev@924404dff337 |
3280 | 14 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
15 (branch merge, don't forget to commit) | |
16 -------------- | |
3288
438b0638dbf5
Fix undetected change bug in rename tests
Matt Mackall <mpm@selenic.com>
parents:
3282
diff
changeset
|
17 M a |
3280 | 18 M b |
19 a | |
20 -------------- | |
21 | |
22 -------------- | |
23 test L:nc a b R:up a W: - 2 get rem change to a and b | |
24 -------------- | |
25 resolving manifests | |
26 overwrite None branchmerge True partial False | |
27 ancestor ac809aeed39a local f4db7e329e71 remote 924404dff337 | |
28 a: remote is newer -> g | |
3314
ecc1bf27378c
merge: unify merge and copy actions
Matt Mackall <mpm@selenic.com>
parents:
3305
diff
changeset
|
29 b: local copied -> m |
3280 | 30 rev: versions differ -> m |
31 getting a | |
3317
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3314
diff
changeset
|
32 merging b and a |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
33 my b@. other a@f4db7e329e71 ancestor a@924404dff337 |
3280 | 34 merging rev |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
35 my rev@. other rev@f4db7e329e71 ancestor rev@924404dff337 |
3280 | 36 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
37 (branch merge, don't forget to commit) | |
38 -------------- | |
39 M a | |
40 M b | |
3295
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3288
diff
changeset
|
41 a |
3280 | 42 -------------- |
43 | |
44 -------------- | |
45 test L:up a R:nm a b W: - 3 get local a change to b, remove a | |
46 -------------- | |
47 resolving manifests | |
48 overwrite None branchmerge True partial False | |
49 ancestor e300d1c794ec local e03727d2d66b remote 924404dff337 | |
3314
ecc1bf27378c
merge: unify merge and copy actions
Matt Mackall <mpm@selenic.com>
parents:
3305
diff
changeset
|
50 a: remote moved -> m |
3280 | 51 rev: versions differ -> m |
3317
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3314
diff
changeset
|
52 merging a and b |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
53 my a@. other b@e03727d2d66b ancestor a@924404dff337 |
3280 | 54 copying a to b |
55 removing a | |
56 merging rev | |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
57 my rev@. other rev@e03727d2d66b ancestor rev@924404dff337 |
3280 | 58 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
59 (branch merge, don't forget to commit) | |
60 -------------- | |
61 M b | |
62 a | |
63 -------------- | |
64 | |
65 -------------- | |
66 test L:nm a b R:up a W: - 4 get remote change to b | |
67 -------------- | |
68 resolving manifests | |
69 overwrite None branchmerge True partial False | |
70 ancestor ecf3cb2a4219 local f4db7e329e71 remote 924404dff337 | |
3314
ecc1bf27378c
merge: unify merge and copy actions
Matt Mackall <mpm@selenic.com>
parents:
3305
diff
changeset
|
71 b: local moved -> m |
3280 | 72 rev: versions differ -> m |
3317
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3314
diff
changeset
|
73 merging b and a |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
74 my b@. other a@f4db7e329e71 ancestor a@924404dff337 |
3280 | 75 merging rev |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
76 my rev@. other rev@f4db7e329e71 ancestor rev@924404dff337 |
3280 | 77 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
78 (branch merge, don't forget to commit) | |
79 -------------- | |
80 M b | |
3295
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3288
diff
changeset
|
81 a |
3280 | 82 -------------- |
83 | |
84 -------------- | |
85 test L: R:nc a b W: - 5 get b | |
86 -------------- | |
87 resolving manifests | |
88 overwrite None branchmerge True partial False | |
89 ancestor 94b33a1b7f2d local 735846fee2d7 remote 924404dff337 | |
90 rev: versions differ -> m | |
3314
ecc1bf27378c
merge: unify merge and copy actions
Matt Mackall <mpm@selenic.com>
parents:
3305
diff
changeset
|
91 a: remote copied -> m |
3280 | 92 copying a to b |
93 merging rev | |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
94 my rev@. other rev@735846fee2d7 ancestor rev@924404dff337 |
3280 | 95 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
96 (branch merge, don't forget to commit) | |
97 -------------- | |
98 M b | |
99 a | |
3317
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3314
diff
changeset
|
100 C a |
3280 | 101 -------------- |
102 | |
103 -------------- | |
104 test L:nc a b R: W: - 6 nothing | |
105 -------------- | |
106 resolving manifests | |
107 overwrite None branchmerge True partial False | |
108 ancestor ac809aeed39a local 97c705ade336 remote 924404dff337 | |
3314
ecc1bf27378c
merge: unify merge and copy actions
Matt Mackall <mpm@selenic.com>
parents:
3305
diff
changeset
|
109 b: local copied -> m |
3280 | 110 rev: versions differ -> m |
111 merging rev | |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
112 my rev@. other rev@97c705ade336 ancestor rev@924404dff337 |
3280 | 113 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
114 (branch merge, don't forget to commit) | |
115 -------------- | |
116 M b | |
3295
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3288
diff
changeset
|
117 a |
3280 | 118 C a |
119 -------------- | |
120 | |
121 -------------- | |
122 test L: R:nm a b W: - 7 get b | |
123 -------------- | |
124 resolving manifests | |
125 overwrite None branchmerge True partial False | |
126 ancestor 94b33a1b7f2d local e03727d2d66b remote 924404dff337 | |
3314
ecc1bf27378c
merge: unify merge and copy actions
Matt Mackall <mpm@selenic.com>
parents:
3305
diff
changeset
|
127 a: remote moved -> m |
3280 | 128 rev: versions differ -> m |
129 copying a to b | |
130 removing a | |
131 merging rev | |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
132 my rev@. other rev@e03727d2d66b ancestor rev@924404dff337 |
3280 | 133 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
134 (branch merge, don't forget to commit) | |
135 -------------- | |
136 M b | |
137 a | |
138 -------------- | |
139 | |
140 -------------- | |
141 test L:nm a b R: W: - 8 nothing | |
142 -------------- | |
143 resolving manifests | |
144 overwrite None branchmerge True partial False | |
145 ancestor ecf3cb2a4219 local 97c705ade336 remote 924404dff337 | |
3314
ecc1bf27378c
merge: unify merge and copy actions
Matt Mackall <mpm@selenic.com>
parents:
3305
diff
changeset
|
146 b: local moved -> m |
3280 | 147 rev: versions differ -> m |
148 merging rev | |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
149 my rev@. other rev@97c705ade336 ancestor rev@924404dff337 |
3280 | 150 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
151 (branch merge, don't forget to commit) | |
152 -------------- | |
153 M b | |
3295
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3288
diff
changeset
|
154 a |
3280 | 155 -------------- |
156 | |
157 -------------- | |
158 test L:um a b R:um a b W: - 9 do merge with ancestor in a | |
159 -------------- | |
160 resolving manifests | |
161 overwrite None branchmerge True partial False | |
162 ancestor ec03c2ca8642 local 79cc6877a3b7 remote 924404dff337 | |
163 b: versions differ -> m | |
164 rev: versions differ -> m | |
165 merging b | |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
166 my b@. other b@79cc6877a3b7 ancestor a@924404dff337 |
3280 | 167 merging rev |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
168 my rev@. other rev@79cc6877a3b7 ancestor rev@924404dff337 |
3280 | 169 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
170 (branch merge, don't forget to commit) | |
171 -------------- | |
172 M b | |
173 -------------- | |
174 | |
175 -------------- | |
176 test L:nm a b R:nm a c W: - 11 get c, keep b | |
177 -------------- | |
178 resolving manifests | |
179 overwrite None branchmerge True partial False | |
180 ancestor ecf3cb2a4219 local e6abcc1a30c2 remote 924404dff337 | |
181 rev: versions differ -> m | |
182 c: remote created -> g | |
183 getting c | |
184 merging rev | |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
185 my rev@. other rev@e6abcc1a30c2 ancestor rev@924404dff337 |
3280 | 186 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
187 (branch merge, don't forget to commit) | |
188 -------------- | |
189 M c | |
190 C b | |
191 -------------- | |
192 | |
193 -------------- | |
194 test L:nc a b R:up b W: - 12 merge b no ancestor | |
195 -------------- | |
196 resolving manifests | |
197 overwrite None branchmerge True partial False | |
198 ancestor ac809aeed39a local af30c7647fc7 remote 924404dff337 | |
199 b: versions differ -> m | |
200 rev: versions differ -> m | |
201 merging b | |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
202 my b@. other b@af30c7647fc7 ancestor b@000000000000 |
3280 | 203 merging rev |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
204 my rev@. other rev@af30c7647fc7 ancestor rev@924404dff337 |
3280 | 205 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
206 (branch merge, don't forget to commit) | |
207 -------------- | |
208 M b | |
209 C a | |
210 -------------- | |
211 | |
212 -------------- | |
213 test L:up b R:nm a b W: - 13 merge b no ancestor | |
214 -------------- | |
215 resolving manifests | |
216 overwrite None branchmerge True partial False | |
217 ancestor 59318016310c local e03727d2d66b remote 924404dff337 | |
218 a: other deleted -> r | |
219 b: versions differ -> m | |
220 rev: versions differ -> m | |
221 removing a | |
222 merging b | |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
223 my b@. other b@e03727d2d66b ancestor b@000000000000 |
3280 | 224 merging rev |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
225 my rev@. other rev@e03727d2d66b ancestor rev@924404dff337 |
3280 | 226 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
227 (branch merge, don't forget to commit) | |
228 -------------- | |
229 M b | |
230 -------------- | |
231 | |
232 -------------- | |
233 test L:nc a b R:up a b W: - 14 merge b no ancestor | |
234 -------------- | |
235 resolving manifests | |
236 overwrite None branchmerge True partial False | |
237 ancestor ac809aeed39a local 8dbce441892a remote 924404dff337 | |
238 a: remote is newer -> g | |
239 b: versions differ -> m | |
240 rev: versions differ -> m | |
241 getting a | |
242 merging b | |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
243 my b@. other b@8dbce441892a ancestor b@000000000000 |
3280 | 244 merging rev |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
245 my rev@. other rev@8dbce441892a ancestor rev@924404dff337 |
3280 | 246 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
247 (branch merge, don't forget to commit) | |
248 -------------- | |
249 M a | |
250 M b | |
251 -------------- | |
252 | |
253 -------------- | |
254 test L:up b R:nm a b W: - 15 merge b no ancestor, remove a | |
255 -------------- | |
256 resolving manifests | |
257 overwrite None branchmerge True partial False | |
258 ancestor 59318016310c local e03727d2d66b remote 924404dff337 | |
259 a: other deleted -> r | |
260 b: versions differ -> m | |
261 rev: versions differ -> m | |
262 removing a | |
263 merging b | |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
264 my b@. other b@e03727d2d66b ancestor b@000000000000 |
3280 | 265 merging rev |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
266 my rev@. other rev@e03727d2d66b ancestor rev@924404dff337 |
3280 | 267 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
268 (branch merge, don't forget to commit) | |
269 -------------- | |
270 M b | |
271 -------------- | |
272 | |
273 -------------- | |
3282 | 274 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor |
3280 | 275 -------------- |
276 resolving manifests | |
277 overwrite None branchmerge True partial False | |
278 ancestor ac809aeed39a local 8dbce441892a remote 924404dff337 | |
279 a: remote is newer -> g | |
280 b: versions differ -> m | |
281 rev: versions differ -> m | |
282 getting a | |
283 merging b | |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
284 my b@. other b@8dbce441892a ancestor b@000000000000 |
3280 | 285 merging rev |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
286 my rev@. other rev@8dbce441892a ancestor rev@924404dff337 |
3280 | 287 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
288 (branch merge, don't forget to commit) | |
289 -------------- | |
290 M a | |
291 M b | |
292 -------------- | |
293 | |
294 -------------- | |
3282 | 295 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor |
3280 | 296 -------------- |
297 resolving manifests | |
298 overwrite None branchmerge True partial False | |
299 ancestor 0b76e65c8289 local 735846fee2d7 remote 924404dff337 | |
300 b: versions differ -> m | |
301 rev: versions differ -> m | |
302 merging b | |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
303 my b@. other b@735846fee2d7 ancestor b@000000000000 |
3280 | 304 merging rev |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
305 my rev@. other rev@735846fee2d7 ancestor rev@924404dff337 |
3280 | 306 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
307 (branch merge, don't forget to commit) | |
308 -------------- | |
309 M b | |
310 C a | |
311 -------------- | |
312 | |
313 -------------- | |
314 test L:nm a b R:up a b W: - 18 merge b no ancestor | |
315 -------------- | |
316 resolving manifests | |
317 overwrite None branchmerge True partial False | |
318 ancestor ecf3cb2a4219 local 8dbce441892a remote 924404dff337 | |
319 b: versions differ -> m | |
320 rev: versions differ -> m | |
321 a: prompt recreating -> g | |
322 getting a | |
323 merging b | |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
324 my b@. other b@8dbce441892a ancestor b@000000000000 |
3280 | 325 merging rev |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
326 my rev@. other rev@8dbce441892a ancestor rev@924404dff337 |
3280 | 327 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
328 (branch merge, don't forget to commit) | |
329 -------------- | |
330 M a | |
331 M b | |
332 -------------- | |
333 | |
334 -------------- | |
3282 | 335 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a |
3280 | 336 -------------- |
337 resolving manifests | |
338 overwrite None branchmerge True partial False | |
339 ancestor 0b76e65c8289 local e03727d2d66b remote 924404dff337 | |
340 b: versions differ -> m | |
341 rev: versions differ -> m | |
342 merging b | |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
343 my b@. other b@e03727d2d66b ancestor b@000000000000 |
3280 | 344 merging rev |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
345 my rev@. other rev@e03727d2d66b ancestor rev@924404dff337 |
3280 | 346 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
347 (branch merge, don't forget to commit) | |
348 -------------- | |
349 M b | |
350 C a | |
351 -------------- | |
352 | |
353 -------------- | |
354 test L:up a R:um a b W: - 20 merge a and b to b, remove a | |
355 -------------- | |
356 resolving manifests | |
357 overwrite None branchmerge True partial False | |
358 ancestor e300d1c794ec local 79cc6877a3b7 remote 924404dff337 | |
3314
ecc1bf27378c
merge: unify merge and copy actions
Matt Mackall <mpm@selenic.com>
parents:
3305
diff
changeset
|
359 a: remote moved -> m |
3280 | 360 rev: versions differ -> m |
3317
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3314
diff
changeset
|
361 merging a and b |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
362 my a@. other b@79cc6877a3b7 ancestor a@924404dff337 |
3280 | 363 copying a to b |
364 removing a | |
365 merging rev | |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
366 my rev@. other rev@79cc6877a3b7 ancestor rev@924404dff337 |
3280 | 367 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
368 (branch merge, don't forget to commit) | |
369 -------------- | |
370 M b | |
371 a | |
372 -------------- | |
373 | |
374 -------------- | |
375 test L:um a b R:up a W: - 21 merge a and b to b | |
376 -------------- | |
377 resolving manifests | |
378 overwrite None branchmerge True partial False | |
379 ancestor ec03c2ca8642 local f4db7e329e71 remote 924404dff337 | |
3314
ecc1bf27378c
merge: unify merge and copy actions
Matt Mackall <mpm@selenic.com>
parents:
3305
diff
changeset
|
380 b: local moved -> m |
3280 | 381 rev: versions differ -> m |
3317
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3314
diff
changeset
|
382 merging b and a |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
383 my b@. other a@f4db7e329e71 ancestor a@924404dff337 |
3280 | 384 merging rev |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
385 my rev@. other rev@f4db7e329e71 ancestor rev@924404dff337 |
3280 | 386 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
387 (branch merge, don't forget to commit) | |
388 -------------- | |
389 M b | |
3295
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3288
diff
changeset
|
390 a |
3280 | 391 -------------- |
392 | |
393 -------------- | |
394 test L:nm a b R:up a c W: - 23 get c, keep b | |
395 -------------- | |
396 resolving manifests | |
397 overwrite None branchmerge True partial False | |
398 ancestor ecf3cb2a4219 local 2b958612230f remote 924404dff337 | |
3314
ecc1bf27378c
merge: unify merge and copy actions
Matt Mackall <mpm@selenic.com>
parents:
3305
diff
changeset
|
399 b: local moved -> m |
3280 | 400 rev: versions differ -> m |
401 c: remote created -> g | |
3317
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3314
diff
changeset
|
402 merging b and a |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
403 my b@. other a@2b958612230f ancestor a@924404dff337 |
3280 | 404 getting c |
405 merging rev | |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
406 my rev@. other rev@2b958612230f ancestor rev@924404dff337 |
3280 | 407 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
408 (branch merge, don't forget to commit) | |
409 -------------- | |
410 M b | |
3295
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3288
diff
changeset
|
411 a |
3280 | 412 M c |
413 -------------- | |
414 |