Mercurial > hg
view tests/test-issue842.t @ 46580:2076df13d00f
copies-rust: refactor the "deletion" case
We rearrange the code to single out the case where information need to be
overwritten on both side of the merge. This open the way to better dealing with
this case.
Differential Revision: https://phab.mercurial-scm.org/D9651
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 16 Dec 2020 10:59:00 +0100 |
parents | 2fc86d92c4a9 |
children | 55c6ebd11cb9 |
line wrap: on
line source
https://bz.mercurial-scm.org/842 $ hg init $ echo foo > a $ hg ci -Ama adding a $ hg up -r0000 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo bar > a Should issue new head warning: $ hg ci -Amb adding a created new head $ hg up -r0000 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo stuffy > a Should not issue new head warning: $ hg ci -q -Amc $ hg up -r0000 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo crap > a $ hg branch testing marked working directory as branch testing (branches are permanent and global, did you want a bookmark?) Should not issue warning: $ hg ci -q -Amd