[Updated] D9609: copies-test: add test chaining multiple merge

marmoute (Pierre-Yves David) phabricator at mercurial-scm.org
Tue Jan 5 07:58:16 UTC 2021


marmoute added inline comments.

INLINE COMMENTS

> pulkit wrote in test-copies-chain-merge.t:1937
> I thought we can use `known-bad-output` for expected buggy output too.

The logic behind the filelog output is not "buggy" it simply use a different (more arbitrary) tie breaking mechanism that is stable regardless of the p1/p2 order. The behavior of the changeset centric algorithm is more "predictable", a hence a bit better in my opinion, however, the filelog one have been around since for-ever, so lets not touch it.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D9609/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D9609

To: marmoute, #hg-reviewers
Cc: pulkit, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210105/85064e38/attachment-0002.html>


More information about the Mercurial-patches mailing list