Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
14 check-ins using file src/merge.c version c13954354b
|
2010-01-20
| ||
| 15:56 | Pull in the latest fixes from the trunk. check-in: ac8902beec user: drh tags: ssl | |
| 15:55 | Pull in the latest fixes from the trunk. check-in: a3161f5f1f user: drh tags: clear-title | |
| 15:48 | Fix the object ID decoding on the /info page. Ticket [a5403e6eee]. check-in: 5eea3db6c1 user: drh tags: trunk | |
| 15:43 | Fix a memory leak in the check-out logic that prevents opening of massive repositories. Ticket [708eab9d48] check-in: 726a13d296 user: drh tags: trunk | |
|
2010-01-19
| ||
| 18:28 | Add the "pullonly" option to the "autosync" setting. check-in: ea27129c88 user: drh tags: trunk | |
| 18:16 | Pull in all the latest changes from the trunk as of 2010-01-19. check-in: b8df912e2d user: drh tags: ssl | |
| 18:11 | Start a new branch that strives to contain only code for which we hold clear title. check-in: ab0a0d7640 user: drh tags: clear-title | |
| 17:34 | Cleanup of the code used to resolve tag names in contexts where an artifact ID can be entered. check-in: bf56b2ddf4 user: drh tags: trunk | |
| 14:15 | Show the edited user id in annotations. check-in: e7efca9ee9 user: drh tags: trunk | |
|
2010-01-18
| ||
| 22:23 | Add the --stopper option to the "ui" and "server" commands on windows. The argument is the name of a file, which if it exists, causes the server to abort upon receiving the next inbound TCP connection. Use this to shut down fossil servers running as a windows service. check-in: 23c0d16718 user: drh tags: trunk | |
| 21:46 | Remove some weird control character that somehow snuck into the [/doc/tip/www/theory1.wiki] document. check-in: d8aa59fc17 user: drh tags: trunk | |
|
2010-01-14
| ||
| 16:17 | Enchance the "revert" command so that it reverts all changes when no arguments are given. It also prints a message saying that "undo" is available to undo the revert. check-in: eaef1a77cc user: drh tags: trunk | |
| 15:37 | Fix a typo in the [/doc/tip/www/theory1.wiki] documentation page. Ticket [e77e876caf316cc5]. check-in: 81b0597fcd user: drh tags: trunk | |
| 15:34 | If a "merge" or "update" or "revert" fails, then automatically rollback any partial changes to the filesystem. Ticket [a9722a15d2]. check-in: 7c3cb28d0f user: drh tags: trunk | |