Re: [fossil-users] html file - "cannot compute difference between binary files"

2014-03-12 Thread Roy Marples

On 10/03/2014 22:24, Richard Hipp wrote:

The diff-generator in Fossil is unable to cope with lines longer than
8192 bytes.

That could be changed.  (It's a #define, though there are adverse
consequences for making it too large.)  But is a diff on a file with
huge lines like that really useful?  Would a human be able to
understand such a diff?


That would depend on how the diff is presented.
As two long lines? No, I doubt a human could.

But if you present the diff as two wrapped lines side by side

diff A | diff B

and wrapped each at say 35 chars with a clear border and space down the 
middle and highlighted using colour each difference I can see that 
working even on a 80 char wide console.


But equally, the diff command is used to present a difference between 
files. A human might not care about understanding it, as long as 
patch(1) does.


Roy
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] html file - "cannot compute difference between binary files"

2014-03-10 Thread Petr Ferdus
>> As seen in SQLite Documentation pages in checkin 424fd15707 (
>> http://www.sqlite.org/docsrc/info/424fd15707)
>> diffing two versions of html file (art/syntax/all-bnf.html) yields "cannot
>> compute difference between binary files" (
>> http://www.sqlite.org/docsrc/fdiff?v1=873cf35adf14cf34&v2=e16f52bc1f249e5b&sbs=1
>> )
>> I think it is related to the length of the line in the file (approx 8600
>> characters) but still I believe fossil could do better that this. Is it
>> possible to show diffs event for files with long lines?
>>
>
>The diff-generator in Fossil is unable to cope with lines longer than 8192
>bytes.
>
>That could be changed.  (It's a #define, though there are adverse
>consequences for making it too large.)  But is a diff on a file with huge
>lines like that really useful?  Would a human be able to understand such a
>diff?

Thank you for the explanation. What intrigues me that it states "binary file" 
even if file is clearly a text file.
While seeking to see a diff I like to check what the difference is. And than it 
is certainly a matter of way how such
change in long line is presented. If a change in huge line is just small 
perhaps the display could be constructed in similar
way as is for "regular" diff on short lines (with omission of  matching parts)
Just a rough idea.

Thank you for fossil.

Peter
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] html file - "cannot compute difference between binary files"

2014-03-10 Thread Richard Hipp
On Mon, Mar 10, 2014 at 6:16 PM, Petr Ferdus  wrote:

> Hello,
>
> As seen in SQLite Documentation pages in checkin 424fd15707 (
> http://www.sqlite.org/docsrc/info/424fd15707)
> diffing two versions of html file (art/syntax/all-bnf.html) yields "cannot
> compute difference between binary files" (
> http://www.sqlite.org/docsrc/fdiff?v1=873cf35adf14cf34&v2=e16f52bc1f249e5b&sbs=1
> )
> I think it is related to the length of the line in the file (approx 8600
> characters) but still I believe fossil could do better that this. Is it
> possible to show diffs event for files with long lines?
>

The diff-generator in Fossil is unable to cope with lines longer than 8192
bytes.

That could be changed.  (It's a #define, though there are adverse
consequences for making it too large.)  But is a diff on a file with huge
lines like that really useful?  Would a human be able to understand such a
diff?


-- 
D. Richard Hipp
d...@sqlite.org
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


[fossil-users] html file - "cannot compute difference between binary files"

2014-03-10 Thread Petr Ferdus
Hello,

As seen in SQLite Documentation pages in checkin 424fd15707 
(http://www.sqlite.org/docsrc/info/424fd15707)
diffing two versions of html file (art/syntax/all-bnf.html) yields "cannot 
compute difference between binary files" 
(http://www.sqlite.org/docsrc/fdiff?v1=873cf35adf14cf34&v2=e16f52bc1f249e5b&sbs=1)
I think it is related to the length of the line in the file (approx 8600 
characters) but still I believe fossil could do better that this. Is it 
possible to show diffs event for files with long lines?

Thanks.

Peter
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users