tests/test-merge-subrepos.t
author Greg Ward <greg@gerg.ca>
Tue, 11 Oct 2011 21:11:01 -0400
changeset 15227 a7686abf73a6
parent 13437 6169493ac3f9
child 19803 0f64af33fb63
permissions -rw-r--r--
largefiles: factor out lfutil.getminsize()

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