Show More
@@ -601,11 +601,9 b' Test sanitizing ".hg/hgrc" in subrepo' | |||
|
601 | 601 | 8:3473d20bddcf |
|
602 | 602 | $ grep ' s$' .hgsubstate |
|
603 | 603 | c4069473b459cf27fd4d7c2f50c4346b4e936599 s |
|
604 |
$ |
|
|
605 | cat: s/.hg/hgrc: No such file or directory | |
|
604 | $ test -f s/.hg/hgrc | |
|
606 | 605 | [1] |
|
607 |
$ |
|
|
608 | cat: s/sub/.hg/hgrc: No such file or directory | |
|
606 | $ test -f s/sub/.hg/hgrc | |
|
609 | 607 | [1] |
|
610 | 608 | $ cd .. |
|
611 | 609 | |
@@ -636,11 +634,9 b' additional test for "git merge --ff" rou' | |||
|
636 | 634 | |
|
637 | 635 | $ cd tc |
|
638 | 636 | $ hg update -q -C af6d2edbb0d3 |
|
639 |
$ |
|
|
640 | cat: s/.hg/hgrc: No such file or directory | |
|
637 | $ test -f s/.hg/hgrc | |
|
641 | 638 | [1] |
|
642 |
$ |
|
|
643 | cat: s/sub/.hg/hgrc: No such file or directory | |
|
639 | $ test -f s/sub/.hg/hgrc | |
|
644 | 640 | [1] |
|
645 | 641 | $ cd .. |
|
646 | 642 | $ hg -R tc pull -q |
@@ -652,11 +648,9 b' additional test for "git merge --ff" rou' | |||
|
652 | 648 | 9:ed23f7fe024e |
|
653 | 649 | $ grep ' s$' .hgsubstate |
|
654 | 650 | f262643c1077219fbd3858d54e78ef050ef84fbf s |
|
655 |
$ |
|
|
656 | cat: s/.hg/hgrc: No such file or directory | |
|
651 | $ test -f s/.hg/hgrc | |
|
657 | 652 | [1] |
|
658 |
$ |
|
|
659 | cat: s/sub/.hg/hgrc: No such file or directory | |
|
653 | $ test -f s/sub/.hg/hgrc | |
|
660 | 654 | [1] |
|
661 | 655 | |
|
662 | 656 | Test that sanitizing is omitted in meta data area: |
General Comments 0
You need to be logged in to leave comments.
Login now