Mercurial > hg
view tests/test-issue619.t @ 12196:e42bc7f66e25
patchbomb: use ui.promptchoice for diffstat to allow localization of choices
The extra check for ui.interacive from patchbomb's prompt function is not
needed here.
Format boolean prompt as in filemerge.py.
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Wed, 08 Sep 2010 08:31:07 +0200 |
parents | ee41be2bbf5a |
children | 4134686b83e1 |
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 ci -Ammerge Bogus fast-forward should fail: $ hg merge b abort: merging with a working directory ancestor has no effect $ true