equal
deleted
inserted
replaced
599 |
599 |
600 $ unset HGMERGE # make sure HGMERGE doesn't interfere with remaining tests |
600 $ unset HGMERGE # make sure HGMERGE doesn't interfere with remaining tests |
601 |
601 |
602 update is a merge ... |
602 update is a merge ... |
603 |
603 |
|
604 (this also tests that files reverted with '--rev REV' are treated as |
|
605 "modified", even if none of mode, size and timestamp of them isn't |
|
606 changed on the filesystem (see also issue4583)) |
|
607 |
|
608 $ cat >> $HGRCPATH <<EOF |
|
609 > [fakedirstatewritetime] |
|
610 > # emulate invoking dirstate.write() via repo.status() |
|
611 > # at 2000-01-01 00:00 |
|
612 > fakenow = 200001010000 |
|
613 > EOF |
|
614 |
604 $ beforemerge |
615 $ beforemerge |
605 [merge-tools] |
616 [merge-tools] |
606 false.whatever= |
617 false.whatever= |
607 true.priority=1 |
618 true.priority=1 |
608 true.executable=cat |
619 true.executable=cat |
609 # hg update -C 1 |
620 # hg update -C 1 |
610 $ hg update -q 0 |
621 $ hg update -q 0 |
611 $ f -s f |
622 $ f -s f |
612 f: size=17 |
623 f: size=17 |
613 $ touch -t 200001010000 f |
624 $ touch -t 200001010000 f |
614 $ hg status f |
625 $ hg debugrebuildstate |
|
626 $ cat >> $HGRCPATH <<EOF |
|
627 > [extensions] |
|
628 > fakedirstatewritetime = $TESTDIR/fakedirstatewritetime.py |
|
629 > EOF |
615 $ hg revert -q -r 1 . |
630 $ hg revert -q -r 1 . |
|
631 $ cat >> $HGRCPATH <<EOF |
|
632 > [extensions] |
|
633 > fakedirstatewritetime = ! |
|
634 > EOF |
616 $ f -s f |
635 $ f -s f |
617 f: size=17 |
636 f: size=17 |
618 $ touch -t 200001010000 f |
637 $ touch -t 200001010000 f |
619 $ hg status f |
638 $ hg status f |
620 M f |
639 M f |
644 # hg update -C 1 |
663 # hg update -C 1 |
645 $ hg update -q 0 |
664 $ hg update -q 0 |
646 $ f -s f |
665 $ f -s f |
647 f: size=17 |
666 f: size=17 |
648 $ touch -t 200001010000 f |
667 $ touch -t 200001010000 f |
649 $ hg status f |
668 $ hg debugrebuildstate |
|
669 $ cat >> $HGRCPATH <<EOF |
|
670 > [extensions] |
|
671 > fakedirstatewritetime = $TESTDIR/fakedirstatewritetime.py |
|
672 > EOF |
650 $ hg revert -q -r 1 . |
673 $ hg revert -q -r 1 . |
|
674 $ cat >> $HGRCPATH <<EOF |
|
675 > [extensions] |
|
676 > fakedirstatewritetime = ! |
|
677 > EOF |
651 $ f -s f |
678 $ f -s f |
652 f: size=17 |
679 f: size=17 |
653 $ touch -t 200001010000 f |
680 $ touch -t 200001010000 f |
654 $ hg status f |
681 $ hg status f |
655 M f |
682 M f |