211 | |
249 | |
212 o 1 i-1: a -move-> c |
250 o 1 i-1: a -move-> c |
213 | |
251 | |
214 o 0 i-0 initial commit: a b h |
252 o 0 i-0 initial commit: a b h |
215 |
253 |
|
254 - comparing from the merge |
|
255 |
|
256 $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBCm-0")' |
|
257 R d |
|
258 $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mCBm-0")' |
|
259 R d |
|
260 $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mBCm-0")' |
|
261 M b |
|
262 $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCBm-0")' |
|
263 M b |
|
264 $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mBCm-0")' |
|
265 M b |
|
266 R d |
|
267 $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mCBm-0")' |
|
268 M b |
|
269 R d |
|
270 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBCm-0")' |
|
271 M b |
|
272 R a |
|
273 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCBm-0")' |
|
274 M b |
|
275 R a |
|
276 |
|
277 - comparing with the merge children re-adding the file |
|
278 |
|
279 $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBCm-1")' |
|
280 M d |
|
281 $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mCBm-1")' |
|
282 M d |
|
283 $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mBCm-1")' |
|
284 M b |
|
285 A d |
|
286 $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCBm-1")' |
|
287 M b |
|
288 A d |
|
289 $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mBCm-1")' |
|
290 M b |
|
291 M d |
|
292 $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mCBm-1")' |
|
293 M b |
|
294 M d |
|
295 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBCm-1")' |
|
296 M b |
|
297 A d |
|
298 R a |
|
299 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCBm-1")' |
|
300 M b |
|
301 A d |
|
302 R a |
|
303 |
|
304 Comparing with a merge re-adding the file afterward |
|
305 --------------------------------------------------- |
216 |
306 |
217 Merge: |
307 Merge: |
218 - one with change to an unrelated file |
308 - one with change to an unrelated file |
219 - one deleting and recreating the file |
309 - one deleting and recreating the change |
220 |
310 |
221 Note: |
311 Note: |
222 | In this case, the merge get conflicting information since on one side we have |
312 | In this case, one of the merge wrongly record a merge while there is none. |
223 | a "brand new" d. and one the other one we have "d renamed from c (itself |
313 | This lead to bad copy tracing information to be dug up. |
224 | renamed from c)". |
|
225 | |
|
226 | The current code arbitrarily pick one side |
|
227 |
314 |
228 $ hg up 'desc("b-1")' |
315 $ hg up 'desc("b-1")' |
229 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
316 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
230 $ hg merge 'desc("d-2")' |
317 $ hg merge 'desc("d-2")' |
231 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
318 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
253 | |
340 | |
254 o 1 i-1: a -move-> c |
341 o 1 i-1: a -move-> c |
255 | |
342 | |
256 o 0 i-0 initial commit: a b h |
343 o 0 i-0 initial commit: a b h |
257 |
344 |
258 |
|
259 Merge: |
|
260 - the "e-" branch renaming b to f (through 'g') |
|
261 - the "a-" branch renaming d to f (through e) |
|
262 |
|
263 $ hg up 'desc("a-2")' |
|
264 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
265 $ hg merge 'desc("e-2")' |
|
266 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
267 (branch merge, don't forget to commit) |
|
268 $ hg ci -m 'mAEm-0 simple merge - one way' |
|
269 $ hg up 'desc("e-2")' |
|
270 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
271 $ hg merge 'desc("a-2")' |
|
272 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
273 (branch merge, don't forget to commit) |
|
274 $ hg ci -m 'mEAm-0 simple merge - the other way' |
|
275 created new head |
|
276 $ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))' |
|
277 @ 20 mEAm-0 simple merge - the other way |
|
278 |\ |
|
279 +---o 19 mAEm-0 simple merge - one way |
|
280 | |/ |
|
281 | o 10 e-2 g -move-> f |
|
282 | | |
|
283 | o 9 e-1 b -move-> g |
|
284 | | |
|
285 o | 4 a-2: e -move-> f |
|
286 | | |
|
287 o | 3 a-1: d -move-> e |
|
288 |/ |
|
289 o 2 i-2: c -move-> d |
|
290 | |
|
291 o 1 i-1: a -move-> c |
|
292 | |
|
293 o 0 i-0 initial commit: a b h |
|
294 |
|
295 |
|
296 Note: |
|
297 | In this case, one of the merge wrongly record a merge while there is none. |
|
298 | This lead to bad copy tracing information to be dug up. |
|
299 |
|
300 |
|
301 Merge: |
|
302 - one with change to an unrelated file (b) |
|
303 - one overwriting a file (d) with a rename (from h to i to d) |
|
304 |
|
305 $ hg up 'desc("i-2")' |
|
306 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
307 $ hg mv h i |
|
308 $ hg commit -m "f-1: rename h -> i" |
|
309 created new head |
|
310 $ hg mv --force i d |
|
311 $ hg commit -m "f-2: rename i -> d" |
|
312 $ hg debugindex d |
|
313 rev linkrev nodeid p1 p2 |
|
314 0 2 01c2f5eabdc4 000000000000 000000000000 |
|
315 1 8 b004912a8510 000000000000 000000000000 |
|
316 2 17 0bb5445dc4d0 01c2f5eabdc4 b004912a8510 |
|
317 3 22 c72365ee036f 000000000000 000000000000 |
|
318 $ hg up 'desc("b-1")' |
|
319 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
320 $ hg merge 'desc("f-2")' |
|
321 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
322 (branch merge, don't forget to commit) |
|
323 $ hg ci -m 'mBFm-0 simple merge - one way' |
|
324 $ hg up 'desc("f-2")' |
|
325 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
326 $ hg merge 'desc("b-1")' |
|
327 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
328 (branch merge, don't forget to commit) |
|
329 $ hg ci -m 'mFBm-0 simple merge - the other way' |
|
330 created new head |
|
331 $ hg log -G --rev '::(desc("mBFm")+desc("mFBm"))' |
|
332 @ 24 mFBm-0 simple merge - the other way |
|
333 |\ |
|
334 +---o 23 mBFm-0 simple merge - one way |
|
335 | |/ |
|
336 | o 22 f-2: rename i -> d |
|
337 | | |
|
338 | o 21 f-1: rename h -> i |
|
339 | | |
|
340 o | 5 b-1: b update |
|
341 |/ |
|
342 o 2 i-2: c -move-> d |
|
343 | |
|
344 o 1 i-1: a -move-> c |
|
345 | |
|
346 o 0 i-0 initial commit: a b h |
|
347 |
|
348 |
|
349 Merge: |
|
350 - one with change to a file |
|
351 - one deleting and recreating the file |
|
352 |
|
353 $ hg up 'desc("i-2")' |
|
354 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
355 $ echo "some update" >> d |
|
356 $ hg commit -m "g-1: update d" |
|
357 created new head |
|
358 $ hg up 'desc("d-2")' |
|
359 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
360 $ hg merge 'desc("g-1")' --tool :union |
|
361 merging d |
|
362 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
363 (branch merge, don't forget to commit) |
|
364 $ hg ci -m 'mDGm-0 simple merge - one way' |
|
365 $ hg up 'desc("g-1")' |
|
366 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
367 $ hg merge 'desc("d-2")' --tool :union |
|
368 merging d |
|
369 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
370 (branch merge, don't forget to commit) |
|
371 $ hg ci -m 'mGDm-0 simple merge - the other way' |
|
372 created new head |
|
373 $ hg log -G --rev '::(desc("mDGm")+desc("mGDm"))' |
|
374 @ 27 mGDm-0 simple merge - the other way |
|
375 |\ |
|
376 +---o 26 mDGm-0 simple merge - one way |
|
377 | |/ |
|
378 | o 25 g-1: update d |
|
379 | | |
|
380 o | 8 d-2 re-add d |
|
381 | | |
|
382 o | 7 d-1 delete d |
|
383 |/ |
|
384 o 2 i-2: c -move-> d |
|
385 | |
|
386 o 1 i-1: a -move-> c |
|
387 | |
|
388 o 0 i-0 initial commit: a b h |
|
389 |
|
390 |
|
391 |
|
392 Merge: |
|
393 - one with change to a file (d) |
|
394 - one overwriting that file with a rename (from h to i, to d) |
|
395 |
|
396 $ hg up 'desc("f-2")' |
|
397 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
398 $ hg merge 'desc("g-1")' --tool :union |
|
399 merging d |
|
400 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
401 (branch merge, don't forget to commit) |
|
402 $ hg ci -m 'mFGm-0 simple merge - one way' |
|
403 created new head |
|
404 $ hg up 'desc("g-1")' |
|
405 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
406 $ hg merge 'desc("f-2")' --tool :union |
|
407 merging d |
|
408 0 files updated, 1 files merged, 1 files removed, 0 files unresolved |
|
409 (branch merge, don't forget to commit) |
|
410 $ hg ci -m 'mGFm-0 simple merge - the other way' |
|
411 created new head |
|
412 $ hg log -G --rev '::(desc("mGFm")+desc("mFGm"))' |
|
413 @ 29 mGFm-0 simple merge - the other way |
|
414 |\ |
|
415 +---o 28 mFGm-0 simple merge - one way |
|
416 | |/ |
|
417 | o 25 g-1: update d |
|
418 | | |
|
419 o | 22 f-2: rename i -> d |
|
420 | | |
|
421 o | 21 f-1: rename h -> i |
|
422 |/ |
|
423 o 2 i-2: c -move-> d |
|
424 | |
|
425 o 1 i-1: a -move-> c |
|
426 | |
|
427 o 0 i-0 initial commit: a b h |
|
428 |
|
429 |
|
430 |
|
431 Check results |
|
432 ============= |
|
433 |
|
434 merging with unrelated change does not interfer wit the renames |
|
435 --------------------------------------------------------------- |
|
436 |
|
437 - rename on one side |
|
438 - unrelated change on the other side |
|
439 |
|
440 $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mABm")' |
|
441 A f |
|
442 d |
|
443 R d |
|
444 $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBAm")' |
|
445 A f |
|
446 d |
|
447 R d |
|
448 $ hg status --copies --rev 'desc("a-2")' --rev 'desc("mABm")' |
|
449 M b |
|
450 $ hg status --copies --rev 'desc("a-2")' --rev 'desc("mBAm")' |
|
451 M b |
|
452 $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mABm")' |
|
453 M b |
|
454 A f |
|
455 d |
|
456 R d |
|
457 $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mBAm")' |
|
458 M b |
|
459 A f |
|
460 d |
|
461 R d |
|
462 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mABm")' |
|
463 M b |
|
464 A f |
|
465 a |
|
466 R a |
|
467 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBAm")' |
|
468 M b |
|
469 A f |
|
470 a |
|
471 R a |
|
472 |
|
473 merging with the side having a delete |
|
474 ------------------------------------- |
|
475 |
|
476 case summary: |
|
477 - one with change to an unrelated file |
|
478 - one deleting the change |
|
479 and recreate an unrelated file after the merge |
|
480 |
|
481 checks: |
|
482 - comparing from the merge |
|
483 |
|
484 $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBCm-0")' |
|
485 R d |
|
486 $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mCBm-0")' |
|
487 R d |
|
488 $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mBCm-0")' |
|
489 M b |
|
490 $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCBm-0")' |
|
491 M b |
|
492 $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mBCm-0")' |
|
493 M b |
|
494 R d |
|
495 $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mCBm-0")' |
|
496 M b |
|
497 R d |
|
498 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBCm-0")' |
|
499 M b |
|
500 R a |
|
501 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCBm-0")' |
|
502 M b |
|
503 R a |
|
504 |
|
505 - comparing with the merge children re-adding the file |
|
506 |
|
507 $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBCm-1")' |
|
508 M d |
|
509 $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mCBm-1")' |
|
510 M d |
|
511 $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mBCm-1")' |
|
512 M b |
|
513 A d |
|
514 $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCBm-1")' |
|
515 M b |
|
516 A d |
|
517 $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mBCm-1")' |
|
518 M b |
|
519 M d |
|
520 $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mCBm-1")' |
|
521 M b |
|
522 M d |
|
523 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBCm-1")' |
|
524 M b |
|
525 A d |
|
526 R a |
|
527 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCBm-1")' |
|
528 M b |
|
529 A d |
|
530 R a |
|
531 |
|
532 Comparing with a merge re-adding the file afterward |
|
533 --------------------------------------------------- |
|
534 |
|
535 Merge: |
|
536 - one with change to an unrelated file |
|
537 - one deleting and recreating the change |
|
538 |
|
539 Note: |
|
540 | In this case, one of the merge wrongly record a merge while there is none. |
|
541 | This lead to bad copy tracing information to be dug up. |
|
542 |
|
543 $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBDm-0")' |
345 $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBDm-0")' |
544 M d |
346 M d |
545 $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mDBm-0")' |
347 $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mDBm-0")' |
546 M d |
348 M d |
547 $ hg status --copies --rev 'desc("d-2")' --rev 'desc("mBDm-0")' |
349 $ hg status --copies --rev 'desc("d-2")' --rev 'desc("mBDm-0")' |
613 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mDBm-0")' |
409 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mDBm-0")' |
614 M b |
410 M b |
615 A d |
411 A d |
616 R a |
412 R a |
617 |
413 |
|
414 |
618 Comparing with a merge with colliding rename |
415 Comparing with a merge with colliding rename |
619 -------------------------------------------- |
416 -------------------------------------------- |
620 |
417 |
621 - the "e-" branch renaming b to f (through 'g') |
418 - the "e-" branch renaming b to f (through 'g') |
622 - the "a-" branch renaming d to f (through e) |
419 - the "a-" branch renaming d to f (through e) |
623 |
420 |
|
421 $ hg up 'desc("a-2")' |
|
422 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
423 $ hg merge 'desc("e-2")' |
|
424 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
425 (branch merge, don't forget to commit) |
|
426 $ hg ci -m 'mAEm-0 simple merge - one way' |
|
427 $ hg up 'desc("e-2")' |
|
428 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
429 $ hg merge 'desc("a-2")' |
|
430 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
431 (branch merge, don't forget to commit) |
|
432 $ hg ci -m 'mEAm-0 simple merge - the other way' |
|
433 created new head |
|
434 $ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))' |
|
435 @ 20 mEAm-0 simple merge - the other way |
|
436 |\ |
|
437 +---o 19 mAEm-0 simple merge - one way |
|
438 | |/ |
|
439 | o 10 e-2 g -move-> f |
|
440 | | |
|
441 | o 9 e-1 b -move-> g |
|
442 | | |
|
443 o | 4 a-2: e -move-> f |
|
444 | | |
|
445 o | 3 a-1: d -move-> e |
|
446 |/ |
|
447 o 2 i-2: c -move-> d |
|
448 | |
|
449 o 1 i-1: a -move-> c |
|
450 | |
|
451 o 0 i-0 initial commit: a b h |
|
452 |
624 $ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644 f' |
453 $ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644 f' |
625 eb806e34ef6be4c264effd5933d31004ad15a793 644 f |
454 eb806e34ef6be4c264effd5933d31004ad15a793 644 f |
626 $ hg manifest --debug --rev 'desc("mEAm-0")' | grep '644 f' |
455 $ hg manifest --debug --rev 'desc("mEAm-0")' | grep '644 f' |
627 eb806e34ef6be4c264effd5933d31004ad15a793 644 f |
456 eb806e34ef6be4c264effd5933d31004ad15a793 644 f |
628 $ hg manifest --debug --rev 'desc("a-2")' | grep '644 f' |
457 $ hg manifest --debug --rev 'desc("a-2")' | grep '644 f' |
673 A f |
502 A f |
674 a |
503 a |
675 R a |
504 R a |
676 R b |
505 R b |
677 |
506 |
|
507 |
|
508 Note: |
|
509 | In this case, one of the merge wrongly record a merge while there is none. |
|
510 | This lead to bad copy tracing information to be dug up. |
|
511 |
|
512 |
678 Merge: |
513 Merge: |
679 - one with change to an unrelated file (b) |
514 - one with change to an unrelated file (b) |
680 - one overwriting a file (d) with a rename (from h to i to d) |
515 - one overwriting a file (d) with a rename (from h to i to d) |
681 |
516 |
|
517 $ hg up 'desc("i-2")' |
|
518 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
519 $ hg mv h i |
|
520 $ hg commit -m "f-1: rename h -> i" |
|
521 created new head |
|
522 $ hg mv --force i d |
|
523 $ hg commit -m "f-2: rename i -> d" |
|
524 $ hg debugindex d |
|
525 rev linkrev nodeid p1 p2 |
|
526 0 2 01c2f5eabdc4 000000000000 000000000000 |
|
527 1 8 b004912a8510 000000000000 000000000000 |
|
528 2 17 0bb5445dc4d0 01c2f5eabdc4 b004912a8510 |
|
529 3 22 c72365ee036f 000000000000 000000000000 |
|
530 $ hg up 'desc("b-1")' |
|
531 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
532 $ hg merge 'desc("f-2")' |
|
533 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
534 (branch merge, don't forget to commit) |
|
535 $ hg ci -m 'mBFm-0 simple merge - one way' |
|
536 $ hg up 'desc("f-2")' |
|
537 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
538 $ hg merge 'desc("b-1")' |
|
539 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
540 (branch merge, don't forget to commit) |
|
541 $ hg ci -m 'mFBm-0 simple merge - the other way' |
|
542 created new head |
|
543 $ hg log -G --rev '::(desc("mBFm")+desc("mFBm"))' |
|
544 @ 24 mFBm-0 simple merge - the other way |
|
545 |\ |
|
546 +---o 23 mBFm-0 simple merge - one way |
|
547 | |/ |
|
548 | o 22 f-2: rename i -> d |
|
549 | | |
|
550 | o 21 f-1: rename h -> i |
|
551 | | |
|
552 o | 5 b-1: b update |
|
553 |/ |
|
554 o 2 i-2: c -move-> d |
|
555 | |
|
556 o 1 i-1: a -move-> c |
|
557 | |
|
558 o 0 i-0 initial commit: a b h |
|
559 |
682 The overwriting should take over. However, the behavior is currently buggy |
560 The overwriting should take over. However, the behavior is currently buggy |
683 |
561 |
684 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBFm-0")' |
562 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBFm-0")' |
685 M b |
563 M b |
686 A d |
564 A d |
738 o 21 f-1: rename h -> i |
616 o 21 f-1: rename h -> i |
739 : |
617 : |
740 o 0 i-0 initial commit: a b h |
618 o 0 i-0 initial commit: a b h |
741 |
619 |
742 |
620 |
|
621 |
743 Merge: |
622 Merge: |
744 - one with change to a file |
623 - one with change to a file |
745 - one deleting and recreating the file |
624 - one deleting and recreating the file |
746 |
625 |
747 Unlike in the 'BD/DB' cases, an actuall merge happened here. So we should |
626 Unlike in the 'BD/DB' cases, an actual merge happened here. So we should |
748 consider history and rename on both branch of the merge. |
627 consider history and rename on both branch of the merge. |
749 |
628 |
|
629 $ hg up 'desc("i-2")' |
|
630 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
631 $ echo "some update" >> d |
|
632 $ hg commit -m "g-1: update d" |
|
633 created new head |
|
634 $ hg up 'desc("d-2")' |
|
635 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
636 $ hg merge 'desc("g-1")' --tool :union |
|
637 merging d |
|
638 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
639 (branch merge, don't forget to commit) |
|
640 $ hg ci -m 'mDGm-0 simple merge - one way' |
|
641 $ hg up 'desc("g-1")' |
|
642 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
643 $ hg merge 'desc("d-2")' --tool :union |
|
644 merging d |
|
645 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
646 (branch merge, don't forget to commit) |
|
647 $ hg ci -m 'mGDm-0 simple merge - the other way' |
|
648 created new head |
|
649 $ hg log -G --rev '::(desc("mDGm")+desc("mGDm"))' |
|
650 @ 27 mGDm-0 simple merge - the other way |
|
651 |\ |
|
652 +---o 26 mDGm-0 simple merge - one way |
|
653 | |/ |
|
654 | o 25 g-1: update d |
|
655 | | |
|
656 o | 8 d-2 re-add d |
|
657 | | |
|
658 o | 7 d-1 delete d |
|
659 |/ |
|
660 o 2 i-2: c -move-> d |
|
661 | |
|
662 o 1 i-1: a -move-> c |
|
663 | |
|
664 o 0 i-0 initial commit: a b h |
|
665 |
750 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mDGm-0")' |
666 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mDGm-0")' |
751 A d |
667 A d |
752 a |
668 a |
753 R a |
669 R a |
754 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGDm-0")' |
670 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGDm-0")' |