Mercurial > hg
view tests/test-issue619.t @ 14075:bc101902a68d
revlog: introduce _chunkbase to allow filelog to override
Used by revlog.revision to retrieve the base-chunk in a delta chain.
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Sat, 30 Apr 2011 16:33:47 +0200 |
parents | 1792b8a9422b |
children | 41885892796e |
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]