tests/test-merge-subrepos.t
author Pierre-Yves David <pierre-yves.david@fb.com>
Sat, 26 Jul 2014 03:35:42 +0200
branchstable
changeset 21948 c87964b1a775
parent 19803 0f64af33fb63
child 33198 439b4d005b4a
permissions -rw-r--r--
i18n: add parenthesis in Brazilian translation of the resolve message Eu falo brasileiro agora. Eu não sou uma batata!

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