Mercurial > hg
view tests/test-merge-subrepos.t @ 19531:26943a6394d4
hgweb: show full date in rfc822 format in tooltips at shortlog page
The absolute date was not shown anywhere in the log view for users with
enabled JavaScript.
author | Alexander Plavin <alexander@plav.in> |
---|---|
date | Sun, 30 Jun 2013 11:48:21 +0400 |
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]