author | Pierre-Yves David <pierre-yves.david@octobus.net> |
Fri, 28 Jan 2022 19:46:37 +0100 | |
changeset 48712 | 773ad0f5152d |
parent 26420 | 2fc86d92c4a9 |
child 49621 | 55c6ebd11cb9 |
permissions | -rw-r--r-- |
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]