Was: fix merge problem, which cause an OSX broken build check-in: 7885b60187 user: jan.nijtmans tags: ticket-d17d6e5b17

...</verbatim> with an options
"links" or "links=BOOLEAN" attribute.  Improved TH1 tracing and error
reporting capabilities.  Improved documentation on how reports work.

check-in: 23c75abde4 user: drh tags: ticket-enhancements

Functional complete and well-tested

Still experimental, but starts looking better

Should have a LOT more testing before merging it to trunk, because it is dangerous!

The method used is as described at:
http://cygwin.com/cygwin-ug-net/using-specialnames.html The only problematic characters left are ':' and '\', all other problematic characters are handled by translating the...

All div.logo, div.status, div.section and div.divider parts of the html pages are not supposed to be line-wrapped. Some skins do that though the <nobr> tag, other do it by putting "white-space: nowrap;" in css.

This commit changes the skins to do the same using css in all skins.

With this chan...

Fix continuation-byte check for UTF-8 chars > 2 bytes.

simplify utf-8 continuation byte checking, using a loop in stead of separater 2/3/4-byte versions.

src/merge3.c: In function ‘merge_3way’:
src/merge3.c:445:9: warning: ‘zPivot’ may be used uninitialized in this function
src/merge3.c:446:9: warning: ‘zOrig’ may be used uninitialized in this function
src/merge3.c:447:9: warning: ‘zOther’ may be used uninitialized in this function

Don't try to convert binary files.

Factor out main part of UTF-8 check to macro

let looks_like_text() give different values for UTF-16 BE/LE. Not used yet.

For UTF-16, the line-length limit is set to 2/3th of the line length limit for other text, because UTF-16 -> UTF-8 conversion can increase the line length (in bytes) by max 50%. This gu...

re-use looks_like_blob

Trying to commit a file with an UTF-16 BOM will now give a warning, just as a file containing crlf

The --args command line option now accept UTF-16 files as well

src/stash.c: In function ‘stash_cmd’:
src/stash.c:377:16: warning: ‘stashid’ may be used uninitialized in this function
src/stash.c:472:7: note: ‘stashid’ was declared here

Implement looks_like_text(), similar to looks_like_binary() but it can distinguish more types...

This has the effect that on Windows wiki pages can now be in unicode as well.

This has the effect that on Windows the --args file accepts a unicode file, starting with a UTF-16 BOM as well

checkin.c: Make limits the same as in looks_like_binary(), preparation to move the function to diff.c

In the case of only appending, the user was not notified not properly redirected, and the ticket chagnes were not committed.

Still, there should be some kind of warning to the user, if it ends up in such situ... check-in: f02946aa8b user: viriketo tags: trunk

struct utimbuf -> struct _utimbuf (compiler warning with mingw-w64)

a few "const" additions (lower memory footprint, allows C-compiler to optimize better)

struct utimbuf -> struct _utimbuf (compiler warning with mingw-w64)

a few "const" additions

This is not a complete backout of [0c37874941c89] as... check-in: 5c0843a8f1 user: drh tags: trunk