This is an archive of the discontinued Mercurial Phabricator instance.

tests: split out separate test for issue5020
ClosedPublic

Authored by martinvonz on Apr 16 2019, 1:16 PM.

Details

Summary

The test was added to the existing setup in 41f6af50c0d8 (merge: fix
crash on criss cross merge with dir move and delete (issue5020),
2017-01-31). I'm about to make a change that affects that test and
it's much easier to follow if the test case for issue5020 is a
separate test case. The separate test case is based on what mpm
provided in comment 12 on the issue.

hg diff -r 41f6af50c0d8^ tests/test-merge-criss-cross.t after this
patch is pretty small (besides the added test). It's probably easier
for reviewers to look at that than to try to understand the diff
itself (I don't understand it).

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Apr 16 2019, 1:16 PM
pulkit accepted this revision.Apr 17 2019, 5:22 PM
This revision was automatically updated to reflect the committed changes.