D8243: copies: stop recording buggy file merge when new file overwrite an old one
marmoute (Pierre-Yves David)
phabricator at mercurial-scm.org
Sat Mar 7 00:50:51 UTC 2020
marmoute added inline comments.
INLINE COMMENTS
> martinvonz wrote in localrepo.py:2868-2874
> Is this correct when grafting (not merging), such as when rebasing? Is it worth having a test case for that? Is it even possible to get here in that case? Maybe when rebasing a merge commit?
I don't know, but not existing test broke. Consolidating test for the plain merge case already took a long time. Not having any test failure from exisitng rebase/graft test seemed enough to me while making progress on the correctness of this.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D8243/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D8243
To: marmoute, #hg-reviewers
Cc: martinvonz, mercurial-devel
More information about the Mercurial-devel
mailing list