Mercurial > hg-stable
view tests/test-issue619.t @ 46306:7d096e5a5b90
persistent-nodemap: rename the storage.revlog.nodemap.mmap option
Since the feature is publicly known as "persistent-nodemap" this seems better to
reference it as "persistent-nodemap" in related config too. So we rename the
option to `storage.revlog.persistent-nodemap.mmap`.
Differential Revision: https://phab.mercurial-scm.org/D9756
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 13 Jan 2021 23:51:12 +0100 |
parents | 2fc86d92c4a9 |
children | 55c6ebd11cb9 |
line wrap: on
line source
https://bz.mercurial-scm.org/619 $ 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] Even with strange revset (issue4465) $ hg merge ::. abort: merging with a working directory ancestor has no effect [255]