##// END OF EJS Templates
tests: update/remove outdated comments in test-copies-chain-merge.t...
Pulkit Goyal -
r46230:a357688e default
parent child Browse files
Show More
@@ -327,10 +327,6 b' Merge:'
327 - one with change to an unrelated file
327 - one with change to an unrelated file
328 - one deleting and recreating the change
328 - one deleting and recreating the change
329
329
330 Note:
331 | In this case, one of the merge wrongly record a merge while there is none.
332 | This lead to bad copy tracing information to be dug up.
333
334 $ hg up 'desc("b-1")'
330 $ hg up 'desc("b-1")'
335 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
331 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
336 $ hg merge 'desc("d-2")'
332 $ hg merge 'desc("d-2")'
@@ -383,11 +379,6 b' The bugs makes recorded copy is differen'
383 $ hg manifest --debug --rev 'desc("mDBm-0")' | grep '644 d'
379 $ hg manifest --debug --rev 'desc("mDBm-0")' | grep '644 d'
384 b004912a8510032a0350a74daa2803dadfb00e12 644 d
380 b004912a8510032a0350a74daa2803dadfb00e12 644 d
385
381
386 The 0bb5445dc4d02f4e0d86cf16f9f3a411d0f17744 entry is wrong, since the file was
387 deleted on one side (then recreate) and untouched on the other side, no "merge"
388 has happened. The resulting `d` file is the untouched version from branch `D`,
389 not a merge.
390
391 $ hg manifest --debug --rev 'desc("d-2")' | grep '644 d'
382 $ hg manifest --debug --rev 'desc("d-2")' | grep '644 d'
392 b004912a8510032a0350a74daa2803dadfb00e12 644 d
383 b004912a8510032a0350a74daa2803dadfb00e12 644 d
393 $ hg manifest --debug --rev 'desc("b-1")' | grep '644 d'
384 $ hg manifest --debug --rev 'desc("b-1")' | grep '644 d'
@@ -397,15 +388,13 b' not a merge.'
397 0 2 01c2f5eabdc4 000000000000 000000000000
388 0 2 01c2f5eabdc4 000000000000 000000000000
398 1 8 b004912a8510 000000000000 000000000000
389 1 8 b004912a8510 000000000000 000000000000
399
390
400 (This `hg log` output if wrong, since no merge actually happened).
391 Log output should not include a merge commit as it did not happen
401
392
402 $ hg log -Gfr 'desc("mBDm-0")' d
393 $ hg log -Gfr 'desc("mBDm-0")' d
403 o 8 d-2 re-add d
394 o 8 d-2 re-add d
404 |
395 |
405 ~
396 ~
406
397
407 This `hg log` output is correct
408
409 $ hg log -Gfr 'desc("mDBm-0")' d
398 $ hg log -Gfr 'desc("mDBm-0")' d
410 o 8 d-2 re-add d
399 o 8 d-2 re-add d
411 |
400 |
@@ -588,13 +577,10 b' Merge:'
588 |
577 |
589 o 0 i-0 initial commit: a b h
578 o 0 i-0 initial commit: a b h
590
579
591 The overwriting should take over. However, the behavior is currently buggy
592
593 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBFm-0")'
580 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBFm-0")'
594 M b
581 M b
595 A d
582 A d
596 h
583 h
597 h (false !)
598 R a
584 R a
599 R h
585 R h
600 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFBm-0")'
586 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFBm-0")'
@@ -626,8 +612,6 b' The overwriting should take over. Howeve'
626 i (no-filelog !)
612 i (no-filelog !)
627 R i
613 R i
628
614
629 The following graphlog is wrong, the "a -> c -> d" chain was overwritten and should not appear.
630
631 $ hg log -Gfr 'desc("mBFm-0")' d
615 $ hg log -Gfr 'desc("mBFm-0")' d
632 o 22 f-2: rename i -> d
616 o 22 f-2: rename i -> d
633 |
617 |
@@ -636,8 +620,6 b' The following graphlog is wrong, the "a '
636 o 0 i-0 initial commit: a b h
620 o 0 i-0 initial commit: a b h
637
621
638
622
639 The following output is correct.
640
641 $ hg log -Gfr 'desc("mFBm-0")' d
623 $ hg log -Gfr 'desc("mFBm-0")' d
642 o 22 f-2: rename i -> d
624 o 22 f-2: rename i -> d
643 |
625 |
General Comments 0
You need to be logged in to leave comments. Login now