https://bz.mercurial-scm.org/show_bug.cgi?id=6011
Bug ID: 6011
Summary: Merging recreating deleted files
Product: Mercurial
Version: 4.7.2
Hardware: PC
OS: Linux
Status: UNCONFIRMED
Severity: feature
Priority: wish
Component: Mercurial
Assignee: bugzi...@mercurial-scm.org
Reporter: korita...@gmail.com
CC: mercurial-devel@mercurial-scm.org
In repo: https://bitbucket.org/koritakoa/hg-merge-test/
% hg up -r 4e0d700
% hg merge -r 583eb25
This recreates files which were previously deleted in f0ee7db. This is not what
I expect. I expect `hg status` to be empty after `hg merge`.
More discussion at:
https://www.mercurial-scm.org/pipermail/mercurial/2018-October/051034.html
(detailed discussion about the bug)
https://www.mercurial-scm.org/pipermail/mercurial/2018-October/051038.html
(changes to behaviour across different versions of HG)
--
You are receiving this mail because:
You are on the CC list for the bug.
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
