Mercurial > hg

view tests/test-merge-subrepos.t @ 26297:ccdc2b23fdb8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
debian: configuration so that cacerts is properly loaded This will be included in the mercurial-common package in a followup patch.
author Augie Fackler <augie@google.com>
date Tue, 22 Sep 2015 14:31:17 -0400
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]