tests/test-merge-subrepos.t
author Pierre-Yves David <pierre-yves.david@logilab.fr>
Sat, 10 Nov 2012 02:19:20 +0100
changeset 18073 e411fd79ca69
parent 13437 6169493ac3f9
child 19803 0f64af33fb63
permissions -rw-r--r--
obsolete: refuse to push divergent changeset As other troubles `unstable` and `bumped`. Followup patches may simplify the push code with unification of "obsolescence troubles" handling.

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