This is an archive of the discontinued Mercurial Phabricator instance.

tests: update annotate tests to work around simplemerge bug
ClosedPublic

Authored by martinvonz on May 7 2019, 1:25 AM.

Details

Summary

test-annotate.t and test-fastannotate.hg were failing with --pure
since 57203e0210f8 (copies: calculate mergecopies() based on
pathcopies(), 2019-04-11). It turned out to be because the pure file
merge code behaved differently. I'm guessing it's the
mdiff.get_matching_blocks() that behaves differently, but I haven't
confirmed that.

With this content in the base:

a
a
a

And this on the local side:

a
z
a

And this on the other side:

a
a
a
b4
c
b6

It produced this conflict:

a
z
a
<<<<<<< working copy: b80e3e32f75a - test: c
||||||| base
a
=======
a
b4
c
b5
>>>>>>> merge rev:    64afcdf8e29e - test: mergeb

I don't care enough about the pure Python code to fix it, so this
patch just updates the tests to manually resolve the conflict.

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

martinvonz created this revision.May 7 2019, 1:25 AM
martinvonz planned changes to this revision.May 7 2019, 1:28 AM
martinvonz added inline comments.
tests/test-fastannotate-hg.t
375–377

Hmm, I didn't notice this part until now. I guess I'll have to update this too.

martinvonz edited the summary of this revision. (Show Details)May 7 2019, 11:46 AM
martinvonz updated this revision to Diff 15035.

This is now ready

This revision was automatically updated to reflect the committed changes.