equal
deleted
inserted
replaced
673 $ hg add .hgsub |
673 $ hg add .hgsub |
674 $ hg ci -m 'Added subrepos' |
674 $ hg ci -m 'Added subrepos' |
675 committing subrepository subrepo-1 |
675 committing subrepository subrepo-1 |
676 committing subrepository subrepo-2 |
676 committing subrepository subrepo-2 |
677 $ hg st subrepo-2/file |
677 $ hg st subrepo-2/file |
|
678 |
|
679 Check hg update --clean |
|
680 $ cd $TESTTMP/sub/t |
|
681 $ rm -r t/t.orig |
|
682 $ hg status -S --all |
|
683 C .hgsub |
|
684 C .hgsubstate |
|
685 C a |
|
686 C s/.hgsub |
|
687 C s/.hgsubstate |
|
688 C s/a |
|
689 C s/ss/a |
|
690 C t/t |
|
691 $ echo c1 > s/a |
|
692 $ cd s |
|
693 $ echo c1 > b |
|
694 $ echo c1 > c |
|
695 $ hg add b |
|
696 $ cd .. |
|
697 $ hg status -S |
|
698 M s/a |
|
699 A s/b |
|
700 ? s/c |
|
701 $ hg update -C |
|
702 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
703 $ hg status -S |
|
704 ? s/b |
|
705 ? s/c |