Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
14 check-ins using file src/merge.c version 6593703e67
|
2013-01-17
| ||
| 03:30 | Change 'checkin-count' to simply 'checkins' to keep the output aligned. check-in: d59455e3f2 user: mistachkin tags: trunk | |
|
2013-01-15
| ||
| 19:15 | Moved the "dbstat" command into the "--all" list. check-in: 2f04cc5e54 user: stephan tags: trunk | |
| 18:32 | Expanded the "dbstat" command output a bit. check-in: 29a9e237d8 user: stephan tags: trunk | |
| 10:25 | formatting check-in: 9d657c3be5 user: jan.nijtmans tags: allow-backslash-in-card-filename | |
| 10:22 | merge trunk check-in: 5e710f01b5 user: jan.nijtmans tags: allow-backslash-in-card-filename | |
| 10:21 | one more: if we already know the character is in the range U+E000 - U+FFFF, it cannot be a surrogate any more. check-in: 4f510b66cb user: jan.nijtmans tags: trunk | |
| 10:17 | merge trunk check-in: 15fec2830e user: jan.nijtmans tags: allow-backslash-in-card-filename | |
| 10:15 | Eliminate "continue" statement, makes control flow easier to understand. If we already know a character is non-ASCII, don't need to check for '\\' any more. check-in: 886e1bb2a8 user: jan.nijtmans tags: trunk | |
| 10:03 | merge trunk check-in: 9a88d1963f user: jan.nijtmans tags: allow-backslash-in-card-filename | |
| 03:02 | Ticket enhancements: Add the TICKET.TKT_CTIME field and make it hold the creation time of the ticket. Make sure that a TICKETCHNG entry is created for each change to the ticket if the TICKETCHNG.TKT_RID field exists. check-in: 8554d3e656 user: drh tags: trunk | |
| 02:29 | Fix compiler warnings. check-in: b3bac1158b user: drh tags: trunk | |
|
2013-01-14
| ||
| 12:52 | Change the output format for the "fossil leaves" command and add the --bybranch command-line option which is useful for looking for forks. check-in: f76d912f1d user: drh tags: trunk | |
| 01:54 | When autosync is enabled, do both a PUSH and a PULL following each commit. Adding the PULL here makes detection of a fork work better. check-in: bee86ff39a user: drh tags: trunk | |
| 01:53 | Simplifications to the SQL that determines a fork to merge when the "fossil merge" command has no VERSION argument. check-in: 8a470fd4bc user: drh tags: trunk | |