Mercurial > hg-stable
view tests/test-issue619.t @ 12682:58a3e2608ae4
strip: add --keep flag to avoid modifying wc during strip
Fixes issue1564.
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Sat, 09 Oct 2010 11:02:11 -0500 |
parents | 3b165c127690 |
children | 9e7e24052745 |
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 [255]