> From: Garrett Rooney [mailto:rooneg@electricjellyfish.net]
> Sent: Sunday, February 09, 2003 4:27 PM
> On Sunday, February 9, 2003, at 08:41 AM, philip@tigris.org wrote:
>> If we are to enable the internal diff library then we ought to have
>> some regression tests. So this tests some basic behaviour, but does
>> not test the conflict handling. Some of these tests fail.
>
> first off, thank you thank you thank you for putting these together, we
> absolutely need them.
Couldn't agree more. Phillip: THANKS!
> second, how did you come up with the results for the
> two_way_unified_suspect tests? are you just comparing against the
> output from gnu diff? at least the first 'failure' in there seems to
> produce a valid unified diff, it's just showing slightly more context
> than you're expecting.
Nah, this is a bug. Fortunately not in the core logic ;). Prolly
has something to do with flushing the current hunk in diff_file.c.
I won't really have time to look at this until wednesday.
> perhaps these tests shouldn't be comparing against a cannonical 'good
> result', but instead should be using patch to try to reconstruct the
> original file from the diff, and verifying that it matches.
That would be a good test if the diffs are unpredictable and multiple
outputs are correct. In this case I believe Phillip crafted the files
so that there would be only one possible output.
Sander
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Feb 10 09:13:42 2003