Mercurial > hg-stable

comparison tests/test-subrepo-git.t @ 21751:c5699c2d690b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 13 Jun 2014 17:42:04 -0500
parents 652e07debf10 8621125a1718
children 7a9cbb315d84
comparison
equal deleted inserted replaced
21747:fecead61d222 21751:c5699c2d690b
599 $ cd tc 599 $ cd tc
600 $ hg parents -q 600 $ hg parents -q
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 605 [1]
606 [1] 606 $ test -f s/sub/.hg/hgrc
607 $ cat 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
612 additional test for "git merge --ff" route: 610 additional test for "git merge --ff" route:
613 611
634 f262643c1077219fbd3858d54e78ef050ef84fbf s 632 f262643c1077219fbd3858d54e78ef050ef84fbf s
635 $ cd .. 633 $ cd ..
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 638 [1]
641 [1] 639 $ test -f s/sub/.hg/hgrc
642 $ cat 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
647 $ hg -R tc update -q -C ed23f7fe024e 2>&1 | sort 643 $ hg -R tc update -q -C ed23f7fe024e 2>&1 | sort
648 warning: removing potentially hostile 'hgrc' in '$TESTTMP/tc/s/.hg' (glob) 644 warning: removing potentially hostile 'hgrc' in '$TESTTMP/tc/s/.hg' (glob)
650 $ cd tc 646 $ cd tc
651 $ hg parents -q 647 $ hg parents -q
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 652 [1]
657 [1] 653 $ test -f s/sub/.hg/hgrc
658 $ cat 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:
663 657
664 $ mkdir s/.git/.hg 658 $ mkdir s/.git/.hg