equal
deleted
inserted
replaced
630 $ hg up |
630 $ hg up |
631 A *subdir/a (glob) |
631 A *subdir/a (glob) |
632 Checked out revision 15. |
632 Checked out revision 15. |
633 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
633 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
634 $ cd .. |
634 $ cd .. |
|
635 |
|
636 Test sanitizing ".hg/hgrc" in subrepo |
|
637 |
|
638 $ cd sub/t |
|
639 $ hg update -q -C tip |
|
640 $ cd s |
|
641 $ mkdir .hg |
|
642 $ echo '.hg/hgrc in svn repo' > .hg/hgrc |
|
643 $ mkdir -p sub/.hg |
|
644 $ echo 'sub/.hg/hgrc in svn repo' > sub/.hg/hgrc |
|
645 $ svn add .hg sub |
|
646 A .hg |
|
647 A .hg/hgrc (glob) |
|
648 A sub |
|
649 A sub/.hg (glob) |
|
650 A sub/.hg/hgrc (glob) |
|
651 $ svn ci -m 'add .hg/hgrc to be sanitized at hg update' |
|
652 Adding .hg |
|
653 Adding .hg/hgrc (glob) |
|
654 Adding sub |
|
655 Adding sub/.hg (glob) |
|
656 Adding sub/.hg/hgrc (glob) |
|
657 Transmitting file data .. |
|
658 Committed revision 16. |
|
659 $ svn up -q |
|
660 $ cd .. |
|
661 $ hg commit -S -m 'commit with svn revision including .hg/hgrc' |
|
662 $ grep ' s$' .hgsubstate |
|
663 16 s |
|
664 $ cd .. |
|
665 |
|
666 $ cd tc |
|
667 $ hg pull -u -q 2>&1 | sort |
|
668 warning: removing potentially hostile 'hgrc' in 's/.hg' (glob) |
|
669 warning: removing potentially hostile 'hgrc' in 's/sub/.hg' (glob) |
|
670 $ grep ' s$' .hgsubstate |
|
671 16 s |
|
672 $ cat s/.hg/hgrc |
|
673 cat: s/.hg/hgrc: No such file or directory |
|
674 [1] |
|
675 $ cat s/sub/.hg/hgrc |
|
676 cat: s/sub/.hg/hgrc: No such file or directory |
|
677 [1] |
|
678 |
|
679 $ cd ../.. |