equal
deleted
inserted
replaced
1058 Invoking status precommit hook |
1058 Invoking status precommit hook |
1059 A .hgsub |
1059 A .hgsub |
1060 ? .hgsubstate |
1060 ? .hgsubstate |
1061 $ echo "rev 1" > subrepo/large.txt |
1061 $ echo "rev 1" > subrepo/large.txt |
1062 $ hg -R subrepo add --large subrepo/large.txt |
1062 $ hg -R subrepo add --large subrepo/large.txt |
|
1063 $ hg sum |
|
1064 parent: 1:8ee150ea2e9c tip |
|
1065 add subrepo |
|
1066 branch: default |
|
1067 commit: 1 subrepos |
|
1068 update: (current) |
1063 $ hg st |
1069 $ hg st |
1064 $ hg st -S |
1070 $ hg st -S |
1065 A subrepo/large.txt |
1071 A subrepo/large.txt |
1066 # This is a workaround for not noticing the subrepo is dirty |
1072 $ hg ci -S -m "commit top repo" |
1067 $ hg -R subrepo ci -m "commit large file" |
1073 committing subrepository subrepo |
1068 Invoking status precommit hook |
1074 Invoking status precommit hook |
1069 A large.txt |
1075 A large.txt |
1070 $ hg ci -S -m "commit top repo" |
|
1071 Invoking status precommit hook |
1076 Invoking status precommit hook |
1072 M .hgsubstate |
1077 M .hgsubstate |
|
1078 # No differences |
1073 $ hg st -S |
1079 $ hg st -S |
|
1080 $ hg sum |
|
1081 parent: 2:ce4cd0c527a6 tip |
|
1082 commit top repo |
|
1083 branch: default |
|
1084 commit: (clean) |
|
1085 update: (current) |
1074 $ echo "rev 2" > subrepo/large.txt |
1086 $ echo "rev 2" > subrepo/large.txt |
1075 $ hg st -S |
1087 $ hg st -S |
1076 M subrepo/large.txt |
1088 M subrepo/large.txt |
1077 |
1089 $ hg sum |
1078 $ cd .. |
1090 parent: 2:ce4cd0c527a6 tip |
|
1091 commit top repo |
|
1092 branch: default |
|
1093 commit: 1 subrepos |
|
1094 update: (current) |
|
1095 $ hg ci -m "this commit should fail without -S" |
|
1096 abort: uncommitted changes in subrepo subrepo |
|
1097 (use --subrepos for recursive commit) |
|
1098 [255] |
|
1099 $ cd .. |