Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch merge-remove-temp-files Excluding Merge-Ins
This is equivalent to a diff from ce0bce90 to 31dc956d
|
2020-02-26
| ||
| 15:23 | Implement the --keep-merge-files option for the merge and update commands. Merge-conflict files are omitted without this option. The merge conflict files continue to exist for the stash command. (check-in: d20ead10 user: drh tags: trunk) | |
| 14:07 | The stash now uses the legacy behaviour for merge conflicts, always keeping the baseline/original/merge files, because there's otherwise a potential for undo suffering when stash pop has a conflict. (Thanks to Florian for pointing that out.) (Closed-Leaf check-in: 31dc956d user: stephan tags: merge-remove-temp-files) | |
|
2020-02-25
| ||
| 20:57 | Implemented merge/update --keep-merge-files, per discussion at /forumpost/1407a2d73e. (check-in: 1bfd760d user: stephan tags: merge-remove-temp-files) | |
| 20:04 | Added --admin-user flag to the import command. (check-in: 6c0dfc8c user: drh tags: trunk) | |
| 18:34 | Added --admin-user flag to the import command, per discussion at forumpost/2ecbbdf7c6. (Closed-Leaf check-in: bdc242fb user: stephan tags: import-admin-user) | |
| 15:59 | Improved diff performance by using a 64-bit hash. Now able to diff files with lines up to 32KiB in length. (check-in: ce0bce90 user: drh tags: trunk) | |
| 15:58 | Redo the enhancement of check-in [1e881f59786bd891] in a way that is portable to legacy systems. The strnlen() function is now always available. (check-in: 1a84fe09 user: drh tags: trunk) | |
| 14:45 | Improve diff performance by using a 64-bit hash and a faster hash algorithm. (Closed-Leaf check-in: a4616a2c user: drh tags: diff-optimizations) | |
Changes to src/merge.c.
Changes to src/merge3.c.
Changes to src/stash.c.
Changes to src/update.c.
Changes to www/changes.wiki.