Mercurial > hg
comparison tests/test-subrepo-svn.t @ 21585:652e07debf10
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 27 May 2014 17:41:20 -0700 |
parents | 10f15e34d86c 5900bc09e684 |
children | a5168eb9b2bc |
comparison
equal
deleted
inserted
replaced
21580:32601b0b74c0 | 21585:652e07debf10 |
---|---|
633 $ hg up | 633 $ hg up |
634 A *subdir/a (glob) | 634 A *subdir/a (glob) |
635 Checked out revision 15. | 635 Checked out revision 15. |
636 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 636 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
637 $ cd .. | 637 $ cd .. |
638 | |
639 Test sanitizing ".hg/hgrc" in subrepo | |
640 | |
641 $ cd sub/t | |
642 $ hg update -q -C tip | |
643 $ cd s | |
644 $ mkdir .hg | |
645 $ echo '.hg/hgrc in svn repo' > .hg/hgrc | |
646 $ mkdir -p sub/.hg | |
647 $ echo 'sub/.hg/hgrc in svn repo' > sub/.hg/hgrc | |
648 $ svn add .hg sub | |
649 A .hg | |
650 A .hg/hgrc (glob) | |
651 A sub | |
652 A sub/.hg (glob) | |
653 A sub/.hg/hgrc (glob) | |
654 $ svn ci -m 'add .hg/hgrc to be sanitized at hg update' | |
655 Adding .hg | |
656 Adding .hg/hgrc (glob) | |
657 Adding sub | |
658 Adding sub/.hg (glob) | |
659 Adding sub/.hg/hgrc (glob) | |
660 Transmitting file data .. | |
661 Committed revision 16. | |
662 $ svn up -q | |
663 $ cd .. | |
664 $ hg commit -S -m 'commit with svn revision including .hg/hgrc' | |
665 $ grep ' s$' .hgsubstate | |
666 16 s | |
667 $ cd .. | |
668 | |
669 $ hg -R tc pull -u -q 2>&1 | sort | |
670 warning: removing potentially hostile 'hgrc' in '$TESTTMP/sub/tc/s/.hg' (glob) | |
671 warning: removing potentially hostile 'hgrc' in '$TESTTMP/sub/tc/s/sub/.hg' (glob) | |
672 $ cd tc | |
673 $ grep ' s$' .hgsubstate | |
674 16 s | |
675 $ cat s/.hg/hgrc | |
676 cat: s/.hg/hgrc: No such file or directory | |
677 [1] | |
678 $ cat s/sub/.hg/hgrc | |
679 cat: s/sub/.hg/hgrc: No such file or directory | |
680 [1] | |
681 | |
682 Test that sanitizing is omitted in meta data area: | |
683 | |
684 $ mkdir s/.svn/.hg | |
685 $ echo '.hg/hgrc in svn metadata area' > s/.svn/.hg/hgrc | |
686 $ hg update -q -C '.^1' | |
687 | |
688 $ cd ../.. |