Mercurial > hg
view tests/test-issue619.t @ 13447:931a72e00efa stable
introduce new RequirementError (issue2649)
This improves the misleading error message
$ hg identify
abort: there is no Mercurial repository here (.hg not found)!
to the more explicit
$ hg identify
abort: requirement 'fake' not supported!
for all commands in commands.optionalrepo, which includes the identify
and serve commands in particular.
This is for the case when a new entry in .hg/requires will be defined
in a future Mercurial release.
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Fri, 18 Feb 2011 20:25:25 +0100 |
parents | 9e7e24052745 |
children | 1792b8a9422b |
line wrap: on
line source
http://mercurial.selenic.com/bts/issue619 $ hg init $ echo a > a $ hg ci -Ama adding a $ echo b > b $ hg branch b marked working directory as branch b $ hg ci -Amb adding b $ hg co -C 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved Fast-forward: $ hg merge b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg branch default $ hg parent --template '{rev}:{node|short} {branches}: {desc}\n' 1:06c2121185be b: b $ hg ci -Ammerge created new head Bogus fast-forward should fail: $ hg merge b abort: merging with a working directory ancestor has no effect [255]