Julian Foad wrote:
> On Wed, 2008-11-05 at 23:34 +0100, Neels J. Hofmeyr wrote:
>> Julian Foad wrote:
>>> There's one other little "gotcha": as I noticed a few days ago, there
>>> are cases where one of the diff producers opens a directory and a file
>>> and then doesn't send any changes for the file. We haven't defined
>> Interesting, why would they do that?
>
> I saw when experimenting with "diff --summarize". The file had been
> modified from content A to content B in r2, and then modified from
> content B to content A in r3, so "diff -r1:3" was a null difference. The
> diff producer did a file-open, then sent the before-and-after versions
> to a textual diff routine, which produced... nothing. Then it did a
> file-close.
>
> That's hand-wavy but you get the idea.
Yes, thanks.
I guess it's more a case that could be erased entirely instead of something
that deserves tree-conflict checking...
~Neels
Received on 2008-11-06 01:59:02 CET