equal
deleted
inserted
replaced
173 subrepository s diverged (local revision: 7969594, remote revision: aa84837) |
173 subrepository s diverged (local revision: 7969594, remote revision: aa84837) |
174 (M)erge, keep (l)ocal or keep (r)emote? m |
174 (M)erge, keep (l)ocal or keep (r)emote? m |
175 pulling subrepo s from $TESTTMP/gitroot |
175 pulling subrepo s from $TESTTMP/gitroot |
176 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
176 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
177 (branch merge, don't forget to commit) |
177 (branch merge, don't forget to commit) |
|
178 $ hg st --subrepos s |
|
179 A s/f |
178 $ cat s/f |
180 $ cat s/f |
179 f |
181 f |
180 $ cat s/g |
182 $ cat s/g |
181 g |
183 g |
182 gg |
184 gg |
942 A s/.gitignore |
944 A s/.gitignore |
943 ? s/barfoo |
945 ? s/barfoo |
944 ? s/c.c |
946 ? s/c.c |
945 ? s/cpp.cpp |
947 ? s/cpp.cpp |
946 ? s/foobar.orig |
948 ? s/foobar.orig |
|
949 $ hg st --subrepos s --all |
|
950 A s/.gitignore |
|
951 ? s/barfoo |
|
952 ? s/c.c |
|
953 ? s/cpp.cpp |
|
954 ? s/foobar.orig |
|
955 I s/snake.python |
|
956 C s/f |
|
957 C s/foobar |
|
958 C s/g |
947 $ hg add --subrepos "glob:**.python" |
959 $ hg add --subrepos "glob:**.python" |
948 $ hg st --subrepos s |
960 $ hg st --subrepos s |
949 A s/.gitignore |
961 A s/.gitignore |
950 ? s/barfoo |
962 ? s/barfoo |
951 ? s/c.c |
963 ? s/c.c |
976 |
988 |
977 error given when adding an already tracked file |
989 error given when adding an already tracked file |
978 $ hg add s/.gitignore |
990 $ hg add s/.gitignore |
979 s/.gitignore already tracked! |
991 s/.gitignore already tracked! |
980 [1] |
992 [1] |
|
993 $ hg add s/g |
|
994 s/g already tracked! |
|
995 [1] |
981 |
996 |
982 removed files can be re-added |
997 removed files can be re-added |
|
998 removing files using 'rm' or 'git rm' has the same effect, |
|
999 since we ignore the staging area |
983 $ hg ci --subrepos -m 'snake' |
1000 $ hg ci --subrepos -m 'snake' |
984 committing subrepository s |
1001 committing subrepository s |
985 $ cd s |
1002 $ cd s |
|
1003 $ rm snake.python |
|
1004 (remove leftover .hg so Mercurial doesn't look for a root here) |
|
1005 $ rm -r .hg |
|
1006 $ hg status --subrepos --all . |
|
1007 R snake.python |
|
1008 ? barfoo |
|
1009 ? c.c |
|
1010 ? cpp.cpp |
|
1011 ? foobar.orig |
|
1012 C .gitignore |
|
1013 C f |
|
1014 C foobar |
|
1015 C g |
986 $ git rm snake.python |
1016 $ git rm snake.python |
987 rm 'snake.python' |
1017 rm 'snake.python' |
|
1018 $ hg status --subrepos --all . |
|
1019 R snake.python |
|
1020 ? barfoo |
|
1021 ? c.c |
|
1022 ? cpp.cpp |
|
1023 ? foobar.orig |
|
1024 C .gitignore |
|
1025 C f |
|
1026 C foobar |
|
1027 C g |
988 $ touch snake.python |
1028 $ touch snake.python |
989 $ cd .. |
1029 $ cd .. |
990 $ hg add s/snake.python |
1030 $ hg add s/snake.python |
991 $ hg status -S |
1031 $ hg status -S |
992 M s/snake.python |
1032 M s/snake.python |