tests/test-merge-subrepos.t
author Yuya Nishihara <yuya@tcha.org>
Mon, 31 Oct 2011 00:42:32 +0900
branchstable
changeset 15388 eb6c0d47c3d5
parent 13437 6169493ac3f9
child 19803 0f64af33fb63
permissions -rw-r--r--
setup: set whole env for running hg even if .hg doesn't exist (issue3073) The issue was partially fixed by b357a972d6cd, but there were missing variables to run build_hgextindex.

  $ hg init

  $ echo a > a
  $ hg ci -qAm 'add a'

  $ hg init subrepo
  $ echo 'subrepo = http://example.net/libfoo' > .hgsub
  $ hg ci -qAm 'added subrepo'

  $ hg up -qC 0
  $ echo ax > a
  $ hg ci -m 'changed a'
  created new head

  $ hg up -qC 1
  $ cd subrepo
  $ echo b > b
  $ hg add b
  $ cd ..

Should fail, since there are added files to subrepo:

  $ hg merge
  abort: outstanding uncommitted changes in subrepository 'subrepo'
  [255]