Page MenuHomePhabricator

copies-tests: update the analysis of the BD/DB cases
ClosedPublic

Authored by marmoute on Mar 5 2020, 1:14 PM.

Details

Summary

After thinking more about it, the current change in output between the two
merges is not due to an ambiguity, it is introduce by a bug in merge/commit
that record a wrong file history.

Fixing the bug should fix the output. In the meantime, we have a wrong behavior.

In practice the bug is not in the merge code (who does the right things), but in
the commit code (who get confused when recording the new file revision).

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Mar 5 2020, 1:14 PM
martinvonz requested changes to this revision.Mar 6 2020, 3:05 AM

I'm sending a bunch of comments on D8078. I'm hoping some of them can incorporated in this series.

This revision now requires changes to proceed.Mar 6 2020, 3:05 AM
martinvonz added inline comments.Mar 6 2020, 11:07 AM
tests/test-copies-chain-merge.t
297–298

"*one* of"

Also, shouldn't this exactly duplicate the comment on lines 456-457?

521

why change this?

marmoute added inline comments.Mar 6 2020, 11:20 AM
tests/test-copies-chain-merge.t
521

I wanted to highlight the expected change when the fix arrive. We can drop it if this confuse you.

martinvonz added inline comments.Mar 6 2020, 11:28 AM
tests/test-copies-chain-merge.t
521

Yes, I find it confusing (especially with the "This output is correct" comment above), so please remove.

marmoute updated this revision to Diff 20588.Mar 6 2020, 6:51 PM

series update after Martin feedback

This revision was not accepted when it landed; it landed in state Needs Review.
This revision was automatically updated to reflect the committed changes.