comparison tests/test-subrepo-git.t @ 14469:2fdea636f254 stable

subrepo: don't crash when git .hgsubstate is empty (issue2716)

14379:bd23d5f28bbb

  cloning subrepo s
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg sum | grep commit
  commit: (clean)

Check hg update --clean
  $ cd $TESTTMP/ta
  $ echo  > s/g
  $ cd s
  $ echo c1 > f1

14469:2fdea636f254

  cloning subrepo s
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg sum | grep commit
  commit: (clean)

Don't crash if the .hgsubstate entry is missing

  $ hg update 1 -q
  $ hg rm .hgsubstate
  $ hg commit .hgsubstate -m 'no substate'
  created new head
  $ hg tag -l nosubstate
  $ hg manifest
  .hgsub
  a

  $ hg status -S
  $ hg sum | grep commit
  commit: 1 subrepos

  $ hg commit -m 'restore substate'
  committing subrepository s
  $ hg manifest
  .hgsub
  .hgsubstate
  a
  $ hg sum | grep commit
  commit: (clean)

  $ hg update -qC nosubstate
  $ ls s

Check hg update --clean
  $ cd $TESTTMP/ta
  $ echo  > s/g
  $ cd s
  $ echo c1 > f1