equal
deleted
inserted
replaced
32 $ cd ../t |
32 $ cd ../t |
33 $ echo 's = [git]../gitroot' > .hgsub |
33 $ echo 's = [git]../gitroot' > .hgsub |
34 $ git clone -q ../gitroot s |
34 $ git clone -q ../gitroot s |
35 $ hg add .hgsub |
35 $ hg add .hgsub |
36 $ hg commit -m 'new git subrepo' |
36 $ hg commit -m 'new git subrepo' |
37 committing subrepository s |
|
38 $ hg debugsub |
37 $ hg debugsub |
39 path s |
38 path s |
40 source ../gitroot |
39 source ../gitroot |
41 revision da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 |
40 revision da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 |
42 |
41 |
53 |
52 |
54 $ cd .. |
53 $ cd .. |
55 $ hg status --subrepos |
54 $ hg status --subrepos |
56 M s/g |
55 M s/g |
57 $ hg commit -m 'update git subrepo' |
56 $ hg commit -m 'update git subrepo' |
58 committing subrepository s |
|
59 $ hg debugsub |
57 $ hg debugsub |
60 path s |
58 path s |
61 source ../gitroot |
59 source ../gitroot |
62 revision 126f2a14290cd5ce061fdedc430170e8d39e1c5a |
60 revision 126f2a14290cd5ce061fdedc430170e8d39e1c5a |
63 |
61 |
220 $ hg pull -u -q |
218 $ hg pull -u -q |
221 $ cd s |
219 $ cd s |
222 $ git pull -q >/dev/null 2>/dev/null |
220 $ git pull -q >/dev/null 2>/dev/null |
223 $ cd .. |
221 $ cd .. |
224 $ hg commit -m 'git upstream sync' |
222 $ hg commit -m 'git upstream sync' |
225 committing subrepository s |
|
226 $ hg debugsub |
223 $ hg debugsub |
227 path s |
224 path s |
228 source ../gitroot |
225 source ../gitroot |
229 revision 32a343883b74769118bb1d3b4b1fbf9156f4dddc |
226 revision 32a343883b74769118bb1d3b4b1fbf9156f4dddc |
230 $ hg push -q |
227 $ hg push -q |
285 cloning subrepo s from $TESTTMP/gitroot |
282 cloning subrepo s from $TESTTMP/gitroot |
286 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
283 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
287 $ echo inner = inner > .hgsub |
284 $ echo inner = inner > .hgsub |
288 $ hg add .hgsub |
285 $ hg add .hgsub |
289 $ hg commit -m 'nested sub' |
286 $ hg commit -m 'nested sub' |
290 committing subrepository inner |
|
291 |
287 |
292 nested commit |
288 nested commit |
293 |
289 |
294 $ echo ffff >> inner/s/f |
290 $ echo ffff >> inner/s/f |
295 $ hg status --subrepos |
291 $ hg status --subrepos |
337 Don't crash if the .hgsubstate entry is missing |
333 Don't crash if the .hgsubstate entry is missing |
338 |
334 |
339 $ hg update 1 -q |
335 $ hg update 1 -q |
340 $ hg rm .hgsubstate |
336 $ hg rm .hgsubstate |
341 $ hg commit .hgsubstate -m 'no substate' |
337 $ hg commit .hgsubstate -m 'no substate' |
342 created new head |
338 nothing changed |
|
339 [1] |
343 $ hg tag -l nosubstate |
340 $ hg tag -l nosubstate |
344 $ hg manifest |
341 $ hg manifest |
345 .hgsub |
342 .hgsub |
|
343 .hgsubstate |
346 a |
344 a |
347 |
345 |
348 $ hg status -S |
346 $ hg status -S |
|
347 R .hgsubstate |
349 $ hg sum | grep commit |
348 $ hg sum | grep commit |
350 commit: 1 subrepos |
349 commit: 1 removed, 1 subrepos (new branch head) |
351 |
350 |
352 $ hg commit -m 'restore substate' |
351 $ hg commit -m 'restore substate' |
353 committing subrepository s |
352 nothing changed |
|
353 [1] |
354 $ hg manifest |
354 $ hg manifest |
355 .hgsub |
355 .hgsub |
356 .hgsubstate |
356 .hgsubstate |
357 a |
357 a |
358 $ hg sum | grep commit |
358 $ hg sum | grep commit |
359 commit: (clean) |
359 commit: 1 removed, 1 subrepos (new branch head) |
360 |
360 |
361 $ hg update -qC nosubstate |
361 $ hg update -qC nosubstate |
362 $ ls s |
362 $ ls s |
|
363 g |
363 |
364 |
364 issue3109: false positives in git diff-index |
365 issue3109: false positives in git diff-index |
365 |
366 |
366 $ hg update -q |
367 $ hg update -q |
367 $ touch -t 200001010000 s/g |
368 $ touch -t 200001010000 s/g |