Mercurial > hg

view tests/test-merge-subrepos.t @ 30791:ada160a8cfd8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
similar: rename local variable to not collide with previous Future patches will move the score function to the module level, so let's not shadow that.
author Sean Farley <sean@farley.io>
date Sat, 07 Jan 2017 20:43:49 -0800
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]