Show More
@@ -1,516 +1,524 b'' | |||||
1 | $ "$TESTDIR/hghave" git || exit 80 |
|
1 | $ "$TESTDIR/hghave" git || exit 80 | |
2 |
|
2 | |||
3 | make git commits repeatable |
|
3 | make git commits repeatable | |
4 |
|
4 | |||
|
5 | $ echo "[core]" >> $HOME/.gitconfig | |||
|
6 | $ echo "autocrlf = false" >> $HOME/.gitconfig | |||
5 | $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME |
|
7 | $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME | |
6 | $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL |
|
8 | $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL | |
7 | $ GIT_AUTHOR_DATE='1234567891 +0000'; export GIT_AUTHOR_DATE |
|
9 | $ GIT_AUTHOR_DATE='1234567891 +0000'; export GIT_AUTHOR_DATE | |
8 | $ GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME |
|
10 | $ GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME | |
9 | $ GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL |
|
11 | $ GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL | |
10 | $ GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"; export GIT_COMMITTER_DATE |
|
12 | $ GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"; export GIT_COMMITTER_DATE | |
11 |
|
13 | |||
12 | root hg repo |
|
14 | root hg repo | |
13 |
|
15 | |||
14 | $ hg init t |
|
16 | $ hg init t | |
15 | $ cd t |
|
17 | $ cd t | |
16 | $ echo a > a |
|
18 | $ echo a > a | |
17 | $ hg add a |
|
19 | $ hg add a | |
18 | $ hg commit -m a |
|
20 | $ hg commit -m a | |
19 | $ cd .. |
|
21 | $ cd .. | |
20 |
|
22 | |||
21 | new external git repo |
|
23 | new external git repo | |
22 |
|
24 | |||
23 | $ mkdir gitroot |
|
25 | $ mkdir gitroot | |
24 | $ cd gitroot |
|
26 | $ cd gitroot | |
25 | $ git init -q |
|
27 | $ git init -q | |
26 | $ echo g > g |
|
28 | $ echo g > g | |
27 | $ git add g |
|
29 | $ git add g | |
28 | $ git commit -q -m g |
|
30 | $ git commit -q -m g | |
29 |
|
31 | |||
30 | add subrepo clone |
|
32 | add subrepo clone | |
31 |
|
33 | |||
32 | $ cd ../t |
|
34 | $ cd ../t | |
33 | $ echo 's = [git]../gitroot' > .hgsub |
|
35 | $ echo 's = [git]../gitroot' > .hgsub | |
34 | $ git clone -q ../gitroot s |
|
36 | $ git clone -q ../gitroot s | |
35 | $ hg add .hgsub |
|
37 | $ hg add .hgsub | |
36 | $ hg commit -m 'new git subrepo' |
|
38 | $ hg commit -m 'new git subrepo' | |
37 | $ hg debugsub |
|
39 | $ hg debugsub | |
38 | path s |
|
40 | path s | |
39 | source ../gitroot |
|
41 | source ../gitroot | |
40 | revision da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 |
|
42 | revision da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 | |
41 |
|
43 | |||
42 | record a new commit from upstream from a different branch |
|
44 | record a new commit from upstream from a different branch | |
43 |
|
45 | |||
44 | $ cd ../gitroot |
|
46 | $ cd ../gitroot | |
45 | $ git checkout -q -b testing |
|
47 | $ git checkout -q -b testing | |
46 | $ echo gg >> g |
|
48 | $ echo gg >> g | |
47 | $ git commit -q -a -m gg |
|
49 | $ git commit -q -a -m gg | |
48 |
|
50 | |||
49 | $ cd ../t/s |
|
51 | $ cd ../t/s | |
50 | $ git pull -q >/dev/null 2>/dev/null |
|
52 | $ git pull -q >/dev/null 2>/dev/null | |
51 | $ git checkout -q -b testing origin/testing >/dev/null |
|
53 | $ git checkout -q -b testing origin/testing >/dev/null | |
52 |
|
54 | |||
53 | $ cd .. |
|
55 | $ cd .. | |
54 | $ hg status --subrepos |
|
56 | $ hg status --subrepos | |
55 | M s/g |
|
57 | M s/g | |
56 | $ hg commit -m 'update git subrepo' |
|
58 | $ hg commit -m 'update git subrepo' | |
57 | $ hg debugsub |
|
59 | $ hg debugsub | |
58 | path s |
|
60 | path s | |
59 | source ../gitroot |
|
61 | source ../gitroot | |
60 | revision 126f2a14290cd5ce061fdedc430170e8d39e1c5a |
|
62 | revision 126f2a14290cd5ce061fdedc430170e8d39e1c5a | |
61 |
|
63 | |||
62 | make $GITROOT pushable, by replacing it with a clone with nothing checked out |
|
64 | make $GITROOT pushable, by replacing it with a clone with nothing checked out | |
63 |
|
65 | |||
64 | $ cd .. |
|
66 | $ cd .. | |
65 | $ git clone gitroot gitrootbare --bare -q |
|
67 | $ git clone gitroot gitrootbare --bare -q | |
66 | $ rm -rf gitroot |
|
68 | $ rm -rf gitroot | |
67 | $ mv gitrootbare gitroot |
|
69 | $ mv gitrootbare gitroot | |
68 |
|
70 | |||
69 | clone root |
|
71 | clone root | |
70 |
|
72 | |||
71 | $ cd t |
|
73 | $ cd t | |
72 | $ hg clone . ../tc |
|
74 | $ hg clone . ../tc | |
73 | updating to branch default |
|
75 | updating to branch default | |
74 | cloning subrepo s from $TESTTMP/gitroot |
|
76 | cloning subrepo s from $TESTTMP/gitroot | |
75 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
77 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
76 | $ cd ../tc |
|
78 | $ cd ../tc | |
77 | $ hg debugsub |
|
79 | $ hg debugsub | |
78 | path s |
|
80 | path s | |
79 | source ../gitroot |
|
81 | source ../gitroot | |
80 | revision 126f2a14290cd5ce061fdedc430170e8d39e1c5a |
|
82 | revision 126f2a14290cd5ce061fdedc430170e8d39e1c5a | |
81 |
|
83 | |||
82 | update to previous substate |
|
84 | update to previous substate | |
83 |
|
85 | |||
84 | $ hg update 1 -q |
|
86 | $ hg update 1 -q | |
85 | $ cat s/g |
|
87 | $ cat s/g | |
86 | g |
|
88 | g | |
87 | $ hg debugsub |
|
89 | $ hg debugsub | |
88 | path s |
|
90 | path s | |
89 | source ../gitroot |
|
91 | source ../gitroot | |
90 | revision da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 |
|
92 | revision da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 | |
91 |
|
93 | |||
92 | clone root, make local change |
|
94 | clone root, make local change | |
93 |
|
95 | |||
94 | $ cd ../t |
|
96 | $ cd ../t | |
95 | $ hg clone . ../ta |
|
97 | $ hg clone . ../ta | |
96 | updating to branch default |
|
98 | updating to branch default | |
97 | cloning subrepo s from $TESTTMP/gitroot |
|
99 | cloning subrepo s from $TESTTMP/gitroot | |
98 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
100 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
99 |
|
101 | |||
100 | $ cd ../ta |
|
102 | $ cd ../ta | |
101 | $ echo ggg >> s/g |
|
103 | $ echo ggg >> s/g | |
102 | $ hg status --subrepos |
|
104 | $ hg status --subrepos | |
103 | M s/g |
|
105 | M s/g | |
104 | $ hg commit --subrepos -m ggg |
|
106 | $ hg commit --subrepos -m ggg | |
105 | committing subrepository s |
|
107 | committing subrepository s | |
106 | $ hg debugsub |
|
108 | $ hg debugsub | |
107 | path s |
|
109 | path s | |
108 | source ../gitroot |
|
110 | source ../gitroot | |
109 | revision 79695940086840c99328513acbe35f90fcd55e57 |
|
111 | revision 79695940086840c99328513acbe35f90fcd55e57 | |
110 |
|
112 | |||
111 | clone root separately, make different local change |
|
113 | clone root separately, make different local change | |
112 |
|
114 | |||
113 | $ cd ../t |
|
115 | $ cd ../t | |
114 | $ hg clone . ../tb |
|
116 | $ hg clone . ../tb | |
115 | updating to branch default |
|
117 | updating to branch default | |
116 | cloning subrepo s from $TESTTMP/gitroot |
|
118 | cloning subrepo s from $TESTTMP/gitroot | |
117 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
119 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
118 |
|
120 | |||
119 | $ cd ../tb/s |
|
121 | $ cd ../tb/s | |
120 | $ echo f > f |
|
122 | $ echo f > f | |
121 | $ git add f |
|
123 | $ git add f | |
122 | $ cd .. |
|
124 | $ cd .. | |
123 |
|
125 | |||
124 | $ hg status --subrepos |
|
126 | $ hg status --subrepos | |
125 | A s/f |
|
127 | A s/f | |
126 | $ hg commit --subrepos -m f |
|
128 | $ hg commit --subrepos -m f | |
127 | committing subrepository s |
|
129 | committing subrepository s | |
128 | $ hg debugsub |
|
130 | $ hg debugsub | |
129 | path s |
|
131 | path s | |
130 | source ../gitroot |
|
132 | source ../gitroot | |
131 | revision aa84837ccfbdfedcdcdeeedc309d73e6eb069edc |
|
133 | revision aa84837ccfbdfedcdcdeeedc309d73e6eb069edc | |
132 |
|
134 | |||
133 | user b push changes |
|
135 | user b push changes | |
134 |
|
136 | |||
135 | $ hg push 2>/dev/null |
|
137 | $ hg push 2>/dev/null | |
136 | pushing to $TESTTMP/t |
|
138 | pushing to $TESTTMP/t (glob) | |
137 | pushing branch testing of subrepo s |
|
139 | pushing branch testing of subrepo s | |
138 | searching for changes |
|
140 | searching for changes | |
139 | adding changesets |
|
141 | adding changesets | |
140 | adding manifests |
|
142 | adding manifests | |
141 | adding file changes |
|
143 | adding file changes | |
142 | added 1 changesets with 1 changes to 1 files |
|
144 | added 1 changesets with 1 changes to 1 files | |
143 |
|
145 | |||
144 | user a pulls, merges, commits |
|
146 | user a pulls, merges, commits | |
145 |
|
147 | |||
146 | $ cd ../ta |
|
148 | $ cd ../ta | |
147 | $ hg pull |
|
149 | $ hg pull | |
148 | pulling from $TESTTMP/t |
|
150 | pulling from $TESTTMP/t (glob) | |
149 | searching for changes |
|
151 | searching for changes | |
150 | adding changesets |
|
152 | adding changesets | |
151 | adding manifests |
|
153 | adding manifests | |
152 | adding file changes |
|
154 | adding file changes | |
153 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
155 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
154 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
156 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
155 | $ hg merge 2>/dev/null |
|
157 | $ hg merge 2>/dev/null | |
156 | pulling subrepo s from $TESTTMP/gitroot |
|
158 | pulling subrepo s from $TESTTMP/gitroot | |
157 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
159 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
158 | (branch merge, don't forget to commit) |
|
160 | (branch merge, don't forget to commit) | |
159 | $ cat s/f |
|
161 | $ cat s/f | |
160 | f |
|
162 | f | |
161 | $ cat s/g |
|
163 | $ cat s/g | |
162 | g |
|
164 | g | |
163 | gg |
|
165 | gg | |
164 | ggg |
|
166 | ggg | |
165 | $ hg commit --subrepos -m 'merge' |
|
167 | $ hg commit --subrepos -m 'merge' | |
166 | committing subrepository s |
|
168 | committing subrepository s | |
167 | $ hg status --subrepos --rev 1:5 |
|
169 | $ hg status --subrepos --rev 1:5 | |
168 | M .hgsubstate |
|
170 | M .hgsubstate | |
169 | M s/g |
|
171 | M s/g | |
170 | A s/f |
|
172 | A s/f | |
171 | $ hg debugsub |
|
173 | $ hg debugsub | |
172 | path s |
|
174 | path s | |
173 | source ../gitroot |
|
175 | source ../gitroot | |
174 | revision f47b465e1bce645dbf37232a00574aa1546ca8d3 |
|
176 | revision f47b465e1bce645dbf37232a00574aa1546ca8d3 | |
175 | $ hg push 2>/dev/null |
|
177 | $ hg push 2>/dev/null | |
176 | pushing to $TESTTMP/t |
|
178 | pushing to $TESTTMP/t (glob) | |
177 | pushing branch testing of subrepo s |
|
179 | pushing branch testing of subrepo s | |
178 | searching for changes |
|
180 | searching for changes | |
179 | adding changesets |
|
181 | adding changesets | |
180 | adding manifests |
|
182 | adding manifests | |
181 | adding file changes |
|
183 | adding file changes | |
182 | added 2 changesets with 2 changes to 1 files |
|
184 | added 2 changesets with 2 changes to 1 files | |
183 |
|
185 | |||
184 | make upstream git changes |
|
186 | make upstream git changes | |
185 |
|
187 | |||
186 | $ cd .. |
|
188 | $ cd .. | |
187 | $ git clone -q gitroot gitclone |
|
189 | $ git clone -q gitroot gitclone | |
188 | $ cd gitclone |
|
190 | $ cd gitclone | |
189 | $ echo ff >> f |
|
191 | $ echo ff >> f | |
190 | $ git commit -q -a -m ff |
|
192 | $ git commit -q -a -m ff | |
191 | $ echo fff >> f |
|
193 | $ echo fff >> f | |
192 | $ git commit -q -a -m fff |
|
194 | $ git commit -q -a -m fff | |
193 | $ git push origin testing 2>/dev/null |
|
195 | $ git push origin testing 2>/dev/null | |
194 |
|
196 | |||
195 | make and push changes to hg without updating the subrepo |
|
197 | make and push changes to hg without updating the subrepo | |
196 |
|
198 | |||
197 | $ cd ../t |
|
199 | $ cd ../t | |
198 | $ hg clone . ../td |
|
200 | $ hg clone . ../td | |
199 | updating to branch default |
|
201 | updating to branch default | |
200 | cloning subrepo s from $TESTTMP/gitroot |
|
202 | cloning subrepo s from $TESTTMP/gitroot | |
201 | checking out detached HEAD in subrepo s |
|
203 | checking out detached HEAD in subrepo s | |
202 | check out a git branch if you intend to make changes |
|
204 | check out a git branch if you intend to make changes | |
203 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
205 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
204 | $ cd ../td |
|
206 | $ cd ../td | |
205 | $ echo aa >> a |
|
207 | $ echo aa >> a | |
206 | $ hg commit -m aa |
|
208 | $ hg commit -m aa | |
207 | $ hg push |
|
209 | $ hg push | |
208 | pushing to $TESTTMP/t |
|
210 | pushing to $TESTTMP/t (glob) | |
209 | searching for changes |
|
211 | searching for changes | |
210 | adding changesets |
|
212 | adding changesets | |
211 | adding manifests |
|
213 | adding manifests | |
212 | adding file changes |
|
214 | adding file changes | |
213 | added 1 changesets with 1 changes to 1 files |
|
215 | added 1 changesets with 1 changes to 1 files | |
214 |
|
216 | |||
215 | sync to upstream git, distribute changes |
|
217 | sync to upstream git, distribute changes | |
216 |
|
218 | |||
217 | $ cd ../ta |
|
219 | $ cd ../ta | |
218 | $ hg pull -u -q |
|
220 | $ hg pull -u -q | |
219 | $ cd s |
|
221 | $ cd s | |
220 | $ git pull -q >/dev/null 2>/dev/null |
|
222 | $ git pull -q >/dev/null 2>/dev/null | |
221 | $ cd .. |
|
223 | $ cd .. | |
222 | $ hg commit -m 'git upstream sync' |
|
224 | $ hg commit -m 'git upstream sync' | |
223 | $ hg debugsub |
|
225 | $ hg debugsub | |
224 | path s |
|
226 | path s | |
225 | source ../gitroot |
|
227 | source ../gitroot | |
226 | revision 32a343883b74769118bb1d3b4b1fbf9156f4dddc |
|
228 | revision 32a343883b74769118bb1d3b4b1fbf9156f4dddc | |
227 | $ hg push -q |
|
229 | $ hg push -q | |
228 |
|
230 | |||
229 | $ cd ../tb |
|
231 | $ cd ../tb | |
230 | $ hg pull -q |
|
232 | $ hg pull -q | |
231 | $ hg update 2>/dev/null |
|
233 | $ hg update 2>/dev/null | |
232 | pulling subrepo s from $TESTTMP/gitroot |
|
234 | pulling subrepo s from $TESTTMP/gitroot | |
233 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
235 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
234 | $ hg debugsub |
|
236 | $ hg debugsub | |
235 | path s |
|
237 | path s | |
236 | source ../gitroot |
|
238 | source ../gitroot | |
237 | revision 32a343883b74769118bb1d3b4b1fbf9156f4dddc |
|
239 | revision 32a343883b74769118bb1d3b4b1fbf9156f4dddc | |
238 |
|
240 | |||
239 | update to a revision without the subrepo, keeping the local git repository |
|
241 | update to a revision without the subrepo, keeping the local git repository | |
240 |
|
242 | |||
241 | $ cd ../t |
|
243 | $ cd ../t | |
242 | $ hg up 0 |
|
244 | $ hg up 0 | |
243 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
245 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
244 | $ ls -a s |
|
246 | $ ls -a s | |
245 | . |
|
247 | . | |
246 | .. |
|
248 | .. | |
247 | .git |
|
249 | .git | |
248 |
|
250 | |||
249 | $ hg up 2 |
|
251 | $ hg up 2 | |
250 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
252 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
251 | $ ls -a s |
|
253 | $ ls -a s | |
252 | . |
|
254 | . | |
253 | .. |
|
255 | .. | |
254 | .git |
|
256 | .git | |
255 | g |
|
257 | g | |
256 |
|
258 | |||
257 | archive subrepos |
|
259 | archive subrepos | |
258 |
|
260 | |||
259 | $ cd ../tc |
|
261 | $ cd ../tc | |
260 | $ hg pull -q |
|
262 | $ hg pull -q | |
261 | $ hg archive --subrepos -r 5 ../archive 2>/dev/null |
|
263 | $ hg archive --subrepos -r 5 ../archive 2>/dev/null | |
262 | pulling subrepo s from $TESTTMP/gitroot |
|
264 | pulling subrepo s from $TESTTMP/gitroot | |
263 | $ cd ../archive |
|
265 | $ cd ../archive | |
264 | $ cat s/f |
|
266 | $ cat s/f | |
265 | f |
|
267 | f | |
266 | $ cat s/g |
|
268 | $ cat s/g | |
267 | g |
|
269 | g | |
268 | gg |
|
270 | gg | |
269 | ggg |
|
271 | ggg | |
270 |
|
272 | |||
271 | create nested repo |
|
273 | create nested repo | |
272 |
|
274 | |||
273 | $ cd .. |
|
275 | $ cd .. | |
274 | $ hg init outer |
|
276 | $ hg init outer | |
275 | $ cd outer |
|
277 | $ cd outer | |
276 | $ echo b>b |
|
278 | $ echo b>b | |
277 | $ hg add b |
|
279 | $ hg add b | |
278 | $ hg commit -m b |
|
280 | $ hg commit -m b | |
279 |
|
281 | |||
280 | $ hg clone ../t inner |
|
282 | $ hg clone ../t inner | |
281 | updating to branch default |
|
283 | updating to branch default | |
282 | cloning subrepo s from $TESTTMP/gitroot |
|
284 | cloning subrepo s from $TESTTMP/gitroot | |
283 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
285 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
284 | $ echo inner = inner > .hgsub |
|
286 | $ echo inner = inner > .hgsub | |
285 | $ hg add .hgsub |
|
287 | $ hg add .hgsub | |
286 | $ hg commit -m 'nested sub' |
|
288 | $ hg commit -m 'nested sub' | |
287 |
|
289 | |||
288 | nested commit |
|
290 | nested commit | |
289 |
|
291 | |||
290 | $ echo ffff >> inner/s/f |
|
292 | $ echo ffff >> inner/s/f | |
291 | $ hg status --subrepos |
|
293 | $ hg status --subrepos | |
292 | M inner/s/f |
|
294 | M inner/s/f | |
293 | $ hg commit --subrepos -m nested |
|
295 | $ hg commit --subrepos -m nested | |
294 | committing subrepository inner |
|
296 | committing subrepository inner | |
295 | committing subrepository inner/s |
|
297 | committing subrepository inner/s (glob) | |
296 |
|
298 | |||
297 | nested archive |
|
299 | nested archive | |
298 |
|
300 | |||
299 | $ hg archive --subrepos ../narchive |
|
301 | $ hg archive --subrepos ../narchive | |
300 | $ ls ../narchive/inner/s | grep -v pax_global_header |
|
302 | $ ls ../narchive/inner/s | grep -v pax_global_header | |
301 | f |
|
303 | f | |
302 | g |
|
304 | g | |
303 |
|
305 | |||
304 | relative source expansion |
|
306 | relative source expansion | |
305 |
|
307 | |||
306 | $ cd .. |
|
308 | $ cd .. | |
307 | $ mkdir d |
|
309 | $ mkdir d | |
308 | $ hg clone t d/t |
|
310 | $ hg clone t d/t | |
309 | updating to branch default |
|
311 | updating to branch default | |
310 | cloning subrepo s from $TESTTMP/gitroot |
|
312 | cloning subrepo s from $TESTTMP/gitroot | |
311 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
313 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
312 |
|
314 | |||
313 | Don't crash if the subrepo is missing |
|
315 | Don't crash if the subrepo is missing | |
314 |
|
316 | |||
315 | $ hg clone t missing -q |
|
317 | $ hg clone t missing -q | |
316 | $ cd missing |
|
318 | $ cd missing | |
317 | $ rm -rf s |
|
319 | $ rm -rf s | |
318 | $ hg status -S |
|
320 | $ hg status -S | |
319 | $ hg sum | grep commit |
|
321 | $ hg sum | grep commit | |
320 | commit: 1 subrepos |
|
322 | commit: 1 subrepos | |
321 | $ hg push -q |
|
323 | $ hg push -q | |
322 | abort: subrepo s is missing |
|
324 | abort: subrepo s is missing | |
323 | [255] |
|
325 | [255] | |
324 | $ hg commit --subrepos -qm missing |
|
326 | $ hg commit --subrepos -qm missing | |
325 | abort: subrepo s is missing |
|
327 | abort: subrepo s is missing | |
326 | [255] |
|
328 | [255] | |
327 | $ hg update -C |
|
329 | $ hg update -C | |
328 | cloning subrepo s from $TESTTMP/gitroot |
|
330 | cloning subrepo s from $TESTTMP/gitroot | |
329 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
331 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
330 | $ hg sum | grep commit |
|
332 | $ hg sum | grep commit | |
331 | commit: (clean) |
|
333 | commit: (clean) | |
332 |
|
334 | |||
333 | Don't crash if the .hgsubstate entry is missing |
|
335 | Don't crash if the .hgsubstate entry is missing | |
334 |
|
336 | |||
335 | $ hg update 1 -q |
|
337 | $ hg update 1 -q | |
336 | $ hg rm .hgsubstate |
|
338 | $ hg rm .hgsubstate | |
337 | $ hg commit .hgsubstate -m 'no substate' |
|
339 | $ hg commit .hgsubstate -m 'no substate' | |
338 | nothing changed |
|
340 | nothing changed | |
339 | [1] |
|
341 | [1] | |
340 | $ hg tag -l nosubstate |
|
342 | $ hg tag -l nosubstate | |
341 | $ hg manifest |
|
343 | $ hg manifest | |
342 | .hgsub |
|
344 | .hgsub | |
343 | .hgsubstate |
|
345 | .hgsubstate | |
344 | a |
|
346 | a | |
345 |
|
347 | |||
346 | $ hg status -S |
|
348 | $ hg status -S | |
347 | R .hgsubstate |
|
349 | R .hgsubstate | |
348 | $ hg sum | grep commit |
|
350 | $ hg sum | grep commit | |
349 | commit: 1 removed, 1 subrepos (new branch head) |
|
351 | commit: 1 removed, 1 subrepos (new branch head) | |
350 |
|
352 | |||
351 | $ hg commit -m 'restore substate' |
|
353 | $ hg commit -m 'restore substate' | |
352 | nothing changed |
|
354 | nothing changed | |
353 | [1] |
|
355 | [1] | |
354 | $ hg manifest |
|
356 | $ hg manifest | |
355 | .hgsub |
|
357 | .hgsub | |
356 | .hgsubstate |
|
358 | .hgsubstate | |
357 | a |
|
359 | a | |
358 | $ hg sum | grep commit |
|
360 | $ hg sum | grep commit | |
359 | commit: 1 removed, 1 subrepos (new branch head) |
|
361 | commit: 1 removed, 1 subrepos (new branch head) | |
360 |
|
362 | |||
361 | $ hg update -qC nosubstate |
|
363 | $ hg update -qC nosubstate | |
362 | $ ls s |
|
364 | $ ls s | |
363 | g |
|
365 | g | |
364 |
|
366 | |||
365 | issue3109: false positives in git diff-index |
|
367 | issue3109: false positives in git diff-index | |
366 |
|
368 | |||
367 | $ hg update -q |
|
369 | $ hg update -q | |
368 | $ touch -t 200001010000 s/g |
|
370 | $ touch -t 200001010000 s/g | |
369 | $ hg status --subrepos |
|
371 | $ hg status --subrepos | |
370 | $ touch -t 200001010000 s/g |
|
372 | $ touch -t 200001010000 s/g | |
371 | $ hg sum | grep commit |
|
373 | $ hg sum | grep commit | |
372 | commit: (clean) |
|
374 | commit: (clean) | |
373 |
|
375 | |||
374 | Check hg update --clean |
|
376 | Check hg update --clean | |
375 | $ cd $TESTTMP/ta |
|
377 | $ cd $TESTTMP/ta | |
376 | $ echo > s/g |
|
378 | $ echo > s/g | |
377 | $ cd s |
|
379 | $ cd s | |
378 | $ echo c1 > f1 |
|
380 | $ echo c1 > f1 | |
379 | $ echo c1 > f2 |
|
381 | $ echo c1 > f2 | |
380 | $ git add f1 |
|
382 | $ git add f1 | |
381 | $ cd .. |
|
383 | $ cd .. | |
382 | $ hg status -S |
|
384 | $ hg status -S | |
383 | M s/g |
|
385 | M s/g | |
384 | A s/f1 |
|
386 | A s/f1 | |
385 | $ ls s |
|
387 | $ ls s | |
386 | f |
|
388 | f | |
387 | f1 |
|
389 | f1 | |
388 | f2 |
|
390 | f2 | |
389 | g |
|
391 | g | |
390 | $ hg update --clean |
|
392 | $ hg update --clean | |
391 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
393 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
392 | $ hg status -S |
|
394 | $ hg status -S | |
393 | $ ls s |
|
395 | $ ls s | |
394 | f |
|
396 | f | |
395 | f1 |
|
397 | f1 | |
396 | f2 |
|
398 | f2 | |
397 | g |
|
399 | g | |
398 |
|
400 | |||
399 | Sticky subrepositories, no changes |
|
401 | Sticky subrepositories, no changes | |
400 | $ cd $TESTTMP/ta |
|
402 | $ cd $TESTTMP/ta | |
401 | $ hg id -n |
|
403 | $ hg id -n | |
402 | 7 |
|
404 | 7 | |
403 | $ cd s |
|
405 | $ cd s | |
404 | $ git rev-parse HEAD |
|
406 | $ git rev-parse HEAD | |
405 | 32a343883b74769118bb1d3b4b1fbf9156f4dddc |
|
407 | 32a343883b74769118bb1d3b4b1fbf9156f4dddc | |
406 | $ cd .. |
|
408 | $ cd .. | |
407 | $ hg update 1 > /dev/null 2>&1 |
|
409 | $ hg update 1 > /dev/null 2>&1 | |
408 | $ hg id -n |
|
410 | $ hg id -n | |
409 | 1 |
|
411 | 1 | |
410 | $ cd s |
|
412 | $ cd s | |
411 | $ git rev-parse HEAD |
|
413 | $ git rev-parse HEAD | |
412 | da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 |
|
414 | da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 | |
413 | $ cd .. |
|
415 | $ cd .. | |
414 |
|
416 | |||
415 | Sticky subrepositorys, file changes |
|
417 | Sticky subrepositorys, file changes | |
416 | $ touch s/f1 |
|
418 | $ touch s/f1 | |
417 | $ cd s |
|
419 | $ cd s | |
418 | $ git add f1 |
|
420 | $ git add f1 | |
419 | $ cd .. |
|
421 | $ cd .. | |
420 | $ hg id -n |
|
422 | $ hg id -n | |
421 | 1 |
|
423 | 1 | |
422 | $ cd s |
|
424 | $ cd s | |
423 | $ git rev-parse HEAD |
|
425 | $ git rev-parse HEAD | |
424 | da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 |
|
426 | da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 | |
425 | $ cd .. |
|
427 | $ cd .. | |
426 | $ hg update 4 |
|
428 | $ hg update 4 | |
427 | subrepository sources for s differ |
|
429 | subrepository sources for s differ | |
428 | use (l)ocal source (da5f5b1) or (r)emote source (aa84837)? |
|
430 | use (l)ocal source (da5f5b1) or (r)emote source (aa84837)? | |
429 | l |
|
431 | l | |
430 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
432 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
431 | $ hg id -n |
|
433 | $ hg id -n | |
432 | 4+ |
|
434 | 4+ | |
433 | $ cd s |
|
435 | $ cd s | |
434 | $ git rev-parse HEAD |
|
436 | $ git rev-parse HEAD | |
435 | da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 |
|
437 | da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 | |
436 | $ cd .. |
|
438 | $ cd .. | |
437 | $ hg update --clean tip > /dev/null 2>&1 |
|
439 | $ hg update --clean tip > /dev/null 2>&1 | |
438 |
|
440 | |||
439 | Sticky subrepository, revision updates |
|
441 | Sticky subrepository, revision updates | |
440 | $ hg id -n |
|
442 | $ hg id -n | |
441 | 7 |
|
443 | 7 | |
442 | $ cd s |
|
444 | $ cd s | |
443 | $ git rev-parse HEAD |
|
445 | $ git rev-parse HEAD | |
444 | 32a343883b74769118bb1d3b4b1fbf9156f4dddc |
|
446 | 32a343883b74769118bb1d3b4b1fbf9156f4dddc | |
445 | $ cd .. |
|
447 | $ cd .. | |
446 | $ cd s |
|
448 | $ cd s | |
447 | $ git checkout aa84837ccfbdfedcdcdeeedc309d73e6eb069edc |
|
449 | $ git checkout aa84837ccfbdfedcdcdeeedc309d73e6eb069edc | |
448 | Previous HEAD position was 32a3438... fff |
|
450 | Previous HEAD position was 32a3438... fff | |
449 | HEAD is now at aa84837... f |
|
451 | HEAD is now at aa84837... f | |
450 | $ cd .. |
|
452 | $ cd .. | |
451 | $ hg update 1 |
|
453 | $ hg update 1 | |
452 | subrepository sources for s differ (in checked out version) |
|
454 | subrepository sources for s differ (in checked out version) | |
453 | use (l)ocal source (32a3438) or (r)emote source (da5f5b1)? |
|
455 | use (l)ocal source (32a3438) or (r)emote source (da5f5b1)? | |
454 | l |
|
456 | l | |
455 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
457 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
456 | $ hg id -n |
|
458 | $ hg id -n | |
457 | 1+ |
|
459 | 1+ | |
458 | $ cd s |
|
460 | $ cd s | |
459 | $ git rev-parse HEAD |
|
461 | $ git rev-parse HEAD | |
460 | aa84837ccfbdfedcdcdeeedc309d73e6eb069edc |
|
462 | aa84837ccfbdfedcdcdeeedc309d73e6eb069edc | |
461 | $ cd .. |
|
463 | $ cd .. | |
462 |
|
464 | |||
463 | Sticky subrepository, file changes and revision updates |
|
465 | Sticky subrepository, file changes and revision updates | |
464 | $ touch s/f1 |
|
466 | $ touch s/f1 | |
465 | $ cd s |
|
467 | $ cd s | |
466 | $ git add f1 |
|
468 | $ git add f1 | |
467 | $ git rev-parse HEAD |
|
469 | $ git rev-parse HEAD | |
468 | aa84837ccfbdfedcdcdeeedc309d73e6eb069edc |
|
470 | aa84837ccfbdfedcdcdeeedc309d73e6eb069edc | |
469 | $ cd .. |
|
471 | $ cd .. | |
470 | $ hg id -n |
|
472 | $ hg id -n | |
471 | 1+ |
|
473 | 1+ | |
472 | $ hg update 7 |
|
474 | $ hg update 7 | |
473 | subrepository sources for s differ |
|
475 | subrepository sources for s differ | |
474 | use (l)ocal source (32a3438) or (r)emote source (32a3438)? |
|
476 | use (l)ocal source (32a3438) or (r)emote source (32a3438)? | |
475 | l |
|
477 | l | |
476 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
478 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
477 | $ hg id -n |
|
479 | $ hg id -n | |
478 | 7 |
|
480 | 7 | |
479 | $ cd s |
|
481 | $ cd s | |
480 | $ git rev-parse HEAD |
|
482 | $ git rev-parse HEAD | |
481 | aa84837ccfbdfedcdcdeeedc309d73e6eb069edc |
|
483 | aa84837ccfbdfedcdcdeeedc309d73e6eb069edc | |
482 | $ cd .. |
|
484 | $ cd .. | |
483 |
|
485 | |||
484 | Sticky repository, update --clean |
|
486 | Sticky repository, update --clean | |
485 | $ hg update --clean tip 2>/dev/null |
|
487 | $ hg update --clean tip 2>/dev/null | |
486 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
488 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
487 | $ hg id -n |
|
489 | $ hg id -n | |
488 | 7 |
|
490 | 7 | |
489 | $ cd s |
|
491 | $ cd s | |
490 | $ git rev-parse HEAD |
|
492 | $ git rev-parse HEAD | |
491 | 32a343883b74769118bb1d3b4b1fbf9156f4dddc |
|
493 | 32a343883b74769118bb1d3b4b1fbf9156f4dddc | |
492 | $ cd .. |
|
494 | $ cd .. | |
493 |
|
495 | |||
494 | Test subrepo already at intended revision: |
|
496 | Test subrepo already at intended revision: | |
495 | $ cd s |
|
497 | $ cd s | |
496 | $ git checkout 32a343883b74769118bb1d3b4b1fbf9156f4dddc |
|
498 | $ git checkout 32a343883b74769118bb1d3b4b1fbf9156f4dddc | |
497 | HEAD is now at 32a3438... fff |
|
499 | HEAD is now at 32a3438... fff | |
498 | $ cd .. |
|
500 | $ cd .. | |
499 | $ hg update 1 |
|
501 | $ hg update 1 | |
500 | Previous HEAD position was 32a3438... fff |
|
502 | Previous HEAD position was 32a3438... fff | |
501 | HEAD is now at da5f5b1... g |
|
503 | HEAD is now at da5f5b1... g | |
502 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
504 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
503 | $ hg id -n |
|
505 | $ hg id -n | |
504 | 1 |
|
506 | 1 | |
505 | $ cd s |
|
507 | $ cd s | |
506 | $ git rev-parse HEAD |
|
508 | $ git rev-parse HEAD | |
507 | da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 |
|
509 | da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 | |
508 | $ cd .. |
|
510 | $ cd .. | |
509 |
|
511 | |||
510 | Test forgetting files, not implemented in git subrepo, used to |
|
512 | Test forgetting files, not implemented in git subrepo, used to | |
511 | traceback |
|
513 | traceback | |
|
514 | #if no-windows | |||
512 | $ hg forget 'notafile*' |
|
515 | $ hg forget 'notafile*' | |
513 | notafile*: No such file or directory |
|
516 | notafile*: No such file or directory | |
514 | [1] |
|
517 | [1] | |
|
518 | #else | |||
|
519 | $ hg forget 'notafile' | |||
|
520 | notafile: * (glob) | |||
|
521 | [1] | |||
|
522 | #endif | |||
515 |
|
523 | |||
516 | $ cd .. |
|
524 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now