Timeline
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

10 check-ins using file src/merge.c version 022e558733

2010-12-11
16:36
Add the --tag option to the "commit" command. Add new test cases that make use of the --tag option. Improvements to the testing infrastructure. check-in: 9d723c57ea user: drh tags: trunk
00:28
Update the git fast-export importer so that it is able to handle filenames with spaces - or at least to the extent that the fast-export format is able to deal with such filename. Ticket [4ee4aa5a30733a] check-in: 35aa6f8188 user: drh tags: trunk
2010-12-10
22:02
Create a single subroutine that determines whether a file is a "reserved" file used by Fossil itself, or is potentially a valid repository file. This processing used to be duplicated at each place where it was needed. check-in: 56d69dbd85 user: drh tags: trunk
19:28
Do not show the "manifest" and "manifest.uuid" files as "extra" files if they are generated by Fossil. check-in: 26590b8841 user: drh tags: trunk
18:57
Take care not to show null-diffs with the "diff" command when the checkout contains the results of a merge. Ticket [47d4e76139fd63] check-in: 34341a10b4 user: drh tags: trunk
15:25
Fix typo in an error message. check-in: 20b04536d0 user: drh tags: trunk
2010-12-09
20:48
Fix a typo in the help text for "fossil import". Ticket [e8a6bfa54e0c3] check-in: 973a6b1ee8 user: drh tags: trunk
15:52
New cloning algorithm appears to be much faster at the cost of slightly more network bandwidth. Fully backwards compatible. Need to look at the network bandwidth issue prior to merging with trunk. Perhaps a command-line option for the clone command to select between slow-and-small or fast-and-larger. Closed-Leaf check-in: 8bb8be26ca user: drh tags: experimental
13:56
Use the built-in SQLite caseless string comparison functions instead of the C-library strcasecmp(). Accept mime-type application/x-fossil-uncompressed and avoid decompression when seen. check-in: 0b6c414c6f user: drh tags: trunk
2010-12-08
21:00
Add the --sha1sum option to the "status" and "changes" commands to force a detailed (but slow) SHA1 checksum verification that files have not changed. check-in: e154a4386b user: drh tags: trunk