equal
deleted
inserted
replaced
32 0 |
32 0 |
33 branch: default |
33 branch: default |
34 commit: 1 added, 1 subrepos |
34 commit: 1 added, 1 subrepos |
35 update: (current) |
35 update: (current) |
36 $ hg ci -m1 |
36 $ hg ci -m1 |
|
37 |
|
38 test handling .hgsubstate "added" explicitly. |
|
39 |
|
40 $ hg parents --template '{node}\n{files}\n' |
|
41 7cf8cfea66e410e8e3336508dfeec07b3192de51 |
|
42 .hgsub .hgsubstate |
|
43 $ hg rollback -q |
|
44 $ hg add .hgsubstate |
|
45 $ hg ci -m1 |
|
46 $ hg parents --template '{node}\n{files}\n' |
|
47 7cf8cfea66e410e8e3336508dfeec07b3192de51 |
|
48 .hgsub .hgsubstate |
37 |
49 |
38 Revert subrepo and test subrepo fileset keyword: |
50 Revert subrepo and test subrepo fileset keyword: |
39 |
51 |
40 $ echo b > s/a |
52 $ echo b > s/a |
41 $ hg revert "set:subrepo('glob:s*')" |
53 $ hg revert "set:subrepo('glob:s*')" |
97 2 |
109 2 |
98 branch: default |
110 branch: default |
99 commit: (clean) |
111 commit: (clean) |
100 update: (current) |
112 update: (current) |
101 |
113 |
|
114 test handling .hgsubstate "modified" explicitly. |
|
115 |
|
116 $ hg parents --template '{node}\n{files}\n' |
|
117 df30734270ae757feb35e643b7018e818e78a9aa |
|
118 .hgsubstate |
|
119 $ hg rollback -q |
|
120 $ hg status -A .hgsubstate |
|
121 M .hgsubstate |
|
122 $ hg ci -m2 |
|
123 $ hg parents --template '{node}\n{files}\n' |
|
124 df30734270ae757feb35e643b7018e818e78a9aa |
|
125 .hgsubstate |
|
126 |
102 bump sub rev (and check it is ignored by ui.commitsubrepos) |
127 bump sub rev (and check it is ignored by ui.commitsubrepos) |
103 |
128 |
104 $ echo b > s/a |
129 $ echo b > s/a |
105 $ hg -R s ci -ms1 |
130 $ hg -R s ci -ms1 |
106 $ hg --config ui.commitsubrepos=no ci -m3 |
131 $ hg --config ui.commitsubrepos=no ci -m3 |
181 $ hg rm .hgsub |
206 $ hg rm .hgsub |
182 |
207 |
183 8 |
208 8 |
184 |
209 |
185 $ hg ci -m8 # remove sub |
210 $ hg ci -m8 # remove sub |
|
211 |
|
212 test handling .hgsubstate "removed" explicitly. |
|
213 |
|
214 $ hg parents --template '{node}\n{files}\n' |
|
215 96615c1dad2dc8e3796d7332c77ce69156f7b78e |
|
216 .hgsub .hgsubstate |
|
217 $ hg rollback -q |
|
218 $ hg remove .hgsubstate |
|
219 $ hg ci -m8 |
|
220 $ hg parents --template '{node}\n{files}\n' |
|
221 96615c1dad2dc8e3796d7332c77ce69156f7b78e |
|
222 .hgsub .hgsubstate |
186 |
223 |
187 merge tests |
224 merge tests |
188 |
225 |
189 $ hg co -C 3 |
226 $ hg co -C 3 |
190 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
227 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |