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