equal
deleted
inserted
replaced
332 cloning subrepo s |
332 cloning subrepo s |
333 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
333 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
334 $ hg sum | grep commit |
334 $ hg sum | grep commit |
335 commit: (clean) |
335 commit: (clean) |
336 |
336 |
|
337 Don't crash if the .hgsubstate entry is missing |
|
338 |
|
339 $ hg update 1 -q |
|
340 $ hg rm .hgsubstate |
|
341 $ hg commit .hgsubstate -m 'no substate' |
|
342 created new head |
|
343 $ hg tag -l nosubstate |
|
344 $ hg manifest |
|
345 .hgsub |
|
346 a |
|
347 |
|
348 $ hg status -S |
|
349 $ hg sum | grep commit |
|
350 commit: 1 subrepos |
|
351 |
|
352 $ hg commit -m 'restore substate' |
|
353 committing subrepository s |
|
354 $ hg manifest |
|
355 .hgsub |
|
356 .hgsubstate |
|
357 a |
|
358 $ hg sum | grep commit |
|
359 commit: (clean) |
|
360 |
|
361 $ hg update -qC nosubstate |
|
362 $ ls s |
|
363 |
337 Check hg update --clean |
364 Check hg update --clean |
338 $ cd $TESTTMP/ta |
365 $ cd $TESTTMP/ta |
339 $ echo > s/g |
366 $ echo > s/g |
340 $ cd s |
367 $ cd s |
341 $ echo c1 > f1 |
368 $ echo c1 > f1 |