view tests/test-merge-subrepos.t @ 17146:6b40cc67ceb4

hgweb: show help with verbose sections included This makes sure we see the same help info as with 'hg help <command> --verbose' on the command line, that is, with verbose sections included.
author Adrian Buehlmann <adrian@cadifra.com>
date Tue, 10 Jul 2012 17:52:43 +0200
parents 6169493ac3f9
children 0f64af33fb63
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: outstanding uncommitted changes in subrepository 'subrepo'
  [255]