##// END OF EJS Templates
tests: test more cases where a file got replaced by a copy...
Martin von Zweigbergk -
r46420:4b79e92a default
parent child Browse files
Show More
@@ -462,6 +462,73 b' Try merging the other direction too'
462 $ hg debugpathcopies 0 5
462 $ hg debugpathcopies 0 5
463 x -> z
463 x -> z
464
464
465 Create x and y, then remove y and rename x to y on one side of merge, and
466 modify x on the other side. The modification to x from the second side
467 should be propagated to y.
468 $ newrepo
469 $ echo original > x
470 $ hg add x
471 $ echo unrelated > y
472 $ hg add y
473 $ hg commit -m 'add x and y'
474 $ hg remove y
475 $ hg commit -m 'remove y'
476 $ hg rename x y
477 $ hg commit -m 'rename x to y'
478 $ hg checkout -q 0
479 $ echo modified > x
480 $ hg commit -m 'modify x'
481 created new head
482 $ hg l
483 @ 3 modify x
484 | x
485 | o 2 rename x to y
486 | | x y
487 | o 1 remove y
488 |/ y
489 o 0 add x and y
490 x y
491 #if filelog
492 $ hg merge 2
493 file 'x' was deleted in other [merge rev] but was modified in local [working copy].
494 You can use (c)hanged version, (d)elete, or leave (u)nresolved.
495 What do you want to do? u
496 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
497 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
498 [1]
499 BROKEN: should be "modified"
500 $ cat y
501 original
502 #else
503 $ hg merge 2
504 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
505 (branch merge, don't forget to commit)
506 BROKEN: should be "modified"
507 $ cat y
508 original
509 #endif
510 Same as above, but in the opposite direction
511 #if filelog
512 $ hg co -qC 2
513 $ hg merge 3
514 file 'x' was deleted in local [working copy] but was modified in other [merge rev].
515 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
516 What do you want to do? u
517 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
518 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
519 [1]
520 BROKEN: should be "modified"
521 $ cat y
522 original
523 #else
524 $ hg co -qC 2
525 $ hg merge 3
526 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
527 (branch merge, don't forget to commit)
528 BROKEN: should be "modified"
529 $ cat y
530 original
531 #endif
465
532
466 Create x and y, then rename x to z on one side of merge, and rename y to z and
533 Create x and y, then rename x to z on one side of merge, and rename y to z and
467 then delete z on the other side.
534 then delete z on the other side.
General Comments 0
You need to be logged in to leave comments. Login now