Mercurial > hg
view tests/test-issue619.t @ 22385:95032d2cf96f
fedora: remove sample.hgrc from shipped files
sample.hgrc was long obsolete and was removed in 63ed188e3fc7.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Tue, 02 Sep 2014 14:10:08 -0700 |
parents | 41885892796e |
children | 0c432696dae3 |
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 (branches are permanent and global, did you want a bookmark?) $ 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]