Jon Ross-PerkinsandRichard Smith 18c3622bec Have autoupdate discard conflict markers when possible. (#3440) ...

This now puts file content into a string, allowing conflict markers to
be elided from file content. When code executes, this means it executes
without seeing conflict markers, without a temporary update to the file
that would only remove conflict markers.

Also refactors the main process flow, because it was getting a little
too lengthy. This means passing a bunch of parameters passed around
(partly because TestContext is private on the test class, and I don't
want to change that). I'm hoping that overall it's easier to read the
core loop now.

Mostly tested with some manually added conflict markers, and that
current tests don't change.

---------

Co-authored-by: Richard Smith <richard@metafoo.co.uk>

2023-12-01 17:03:03 +00:00

..

base

Add size="small" to test targets where advised (#3326)

2023-10-24 06:52:00 +00:00

file_test

Have autoupdate discard conflict markers when possible. (#3440)

2023-12-01 17:03:03 +00:00

fuzzing

Add size="small" to test targets where advised (#3326)

2023-10-24 06:52:00 +00:00