Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
20 check-ins using file src/diff.c version c6dcb2ad36
|
2023-07-12
| ||
| 10:36 | Minor internal doc update. check-in: dac7770456 user: stephan tags: trunk | |
|
2023-06-22
| ||
| 08:42 | Rephrase the cryptic sed expression for generating compile_commands.json into something more platform-portable. check-in: c6b9b86399 user: stephan tags: trunk | |
|
2023-06-20
| ||
| 13:48 | Remove some stray end-of-line whitespace. check-in: ab6ce6037c user: stephan tags: trunk | |
| 13:44 | Remove some stray whitespace. check-in: 9c2357b976 user: stephan tags: trunk | |
|
2023-06-17
| ||
| 08:27 | Minor text updates in f-update output. check-in: f9ba9cc02f user: stephan tags: trunk | |
|
2023-05-17
| ||
| 02:20 | Update to sqlite3 trunk (pre-3.43, a few checkins after 3.42.0). check-in: 21063409f6 user: stephan tags: trunk | |
|
2023-04-26
| ||
| 16:26 | Latest upstream fnc. check-in: 251db8cb45 user: stephan tags: trunk | |
| 16:24 | Merge no-common-ancestor branch into trunk. check-in: 0657571903 user: stephan tags: trunk | |
| 16:23 | Remove the no-common-ancestor check from the merge algorith, for conformance with fossil(1)'s new behavior. Closed-Leaf check-in: 3ca3706652 user: stephan tags: no-common-ancestor | |
|
2023-04-23
| ||
| 12:09 | Patch some interrupted-mid-sentence comments. check-in: 1bb1139c7b user: stephan tags: no-common-ancestor | |
| 12:07 | Apply upstream [fossil:7c75e47b3c130ff1]: when merging files with no common ancestor, treat it as if an imaginary common ancestor were an empty file. We currently retain the no-common-ancestor diagnosis but may yet remove it or augment it to permit the user to specify which side of the merge to retain. check-in: 30bd3e8b14 user: stephan tags: no-common-ancestor | |
|
2023-04-21
| ||
| 15:57 | Remove sqlite3ext.h and a C-side reference to it. check-in: 0fe561416a user: stephan tags: trunk | |
|
2023-04-19
| ||
| 12:46 | Update to latest upstream sqlite3ext.h (used by ext_regexp.c). check-in: 231fed9533 user: stephan tags: trunk | |
| 04:03 | Add more missing f(void). check-in: 43181beb49 user: mgagnon tags: trunk | |
| 03:35 | Cherrypick changes from the no-common-ancestor branch which are not strictly relevant to that change. check-in: 1ee281f8ed user: stephan tags: trunk | |
| 03:23 | Remove FSL_MERGE_FCHANGE_CONFLICT_ANCESTOR and its associated handling, as fossil no longer reports that as a problem. (Edit: closing this broken branch to re-start from a clean slate after some sleep.) Closed-Leaf check-in: c575ac0028 user: stephan tags: no-common-ancestor | |
| 03:02 | Additional work on porting over Martin's no-common-ancestor patch. check-in: 5d8201ce25 user: stephan tags: no-common-ancestor | |
| 02:33 | Add missing f(void) for some static func decls to appease newer compilers. check-in: e2d7986f9e user: stephan tags: no-common-ancestor | |
| 02:33 | Latest upstream sqlite3. check-in: a26e462b9c user: stephan tags: no-common-ancestor | |
| 02:26 | Apply a set of missing f(void) and assigned-but-unused vars from Mark J. check-in: b96f5840ea user: stephan tags: no-common-ancestor | |