view tests/test-merge-subrepos.t @ 27054:fe458d078ed7

test-import: don't use printf to append an extension to $HGRCPATH

The extension was failing to load on Windows because $TESTTMP contains a path
component 'test', prefixed by a path separator '\'.  That combination ends up
converted to "...<tab>est...".

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