tests/test-merge-subrepos.t
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
Wed, 02 Oct 2013 11:16:03 +0200
branchstable
changeset 19878 21de61bc2ab5
parent 13437 6169493ac3f9
child 19803 0f64af33fb63
permissions -rw-r--r--
test: make test-propertycache.py python2.4 compatible The subprocess module have not `check_call` method in python2.4. Fall back to calling `check` with return code verification.

  $ 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]