tests/test-merge-subrepos.t
author Adrian Buehlmann <adrian@cadifra.com>
Sun, 06 May 2012 10:36:32 +0200
branchstable
changeset 16585 0c35bb01a119
parent 13437 6169493ac3f9
child 19803 0f64af33fb63
permissions -rw-r--r--
help/config: remove outdated false claim about pywin32 Since version 1.8 (released on 2011-03-01), Mercurial doesn't use pywin32 any more. The old fallback mechanism to use C:\Mercurial\Mercurial.ini if pywin32 is not installed was removed in 244772f67ac1.

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