view tests/test-merge-subrepos.t @ 25276:c436ba9d6ac0

manifest: use match.prefix() instead of 'not match.anypats()' It seems clearer to check for what it is than what it isn't.
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 19 May 2015 11:16:20 -0700
parents 0f64af33fb63
children 439b4d005b4a
line wrap: on
line source

  $ 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: uncommitted changes in subrepository 'subrepo'
  [255]