[Updated] D9003: merge: store cases when a file is absent post merge in commitinfo
marmoute (Pierre-Yves David)
phabricator at mercurial-scm.org
Fri Sep 11 09:16:04 UTC 2020
This revision now requires changes to proceed.
marmoute added inline comments.
marmoute requested changes to this revision.
INLINE COMMENTS
> merge.py:957
> + # we force create a new node
> + mresult.addcommitinfo(f, b'FORCE_NEW_FILENODE', b'yes')
> +
Samfe feedback about the semantic of the data. Transmit something meaningful to the commit code and let the commit code behave has it wish.
> test-merge-criss-cross.t:664
> other-file
> + $ hg debugmergestate
> + no merge state found
We should introduce these in a previous changeset, should we not?
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D9003/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D9003
To: pulkit, #hg-reviewers, marmoute
Cc: marmoute, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20200911/1bad6936/attachment-0002.html>
More information about the Mercurial-patches
mailing list