History of src/merge.c
|
2009-12-30
| ||
| 20:33:59 | [1bca64b642] part of check-in [76bc05d739] merge with trunk (By: btheado on 2009-12-30 20:33:59) [diff] [annotate] | |
|
2009-12-18
| ||
| 00:29:51 | [1bca64b642] part of check-in [76f169fca6] Detect when the check-out contains missing files and filesystem objects that ought to be files but are not. Issue reasonable warnings. (By: drh on 2009-12-18 00:29:51) [diff] [annotate] | |
|
2007-12-05
| ||
| 08:07:46 | [5979683d08] part of check-in [d0305b305a] Merged mainline into my branch to get the newest application. (By: aku on 2007-12-05 08:07:46) [diff] [annotate] | |
|
2007-11-16
| ||
| 20:42:31 | [5979683d08] part of check-in [36b96b8616] Rework the merge algorithm. It now only works for text files. But, it no longer gets confused by line endings (\r\n versus \n) and it reports conflicts. (By: drh on 2007-11-16 20:42:31) [diff] [annotate] | |
|
2007-11-08
| ||
| 16:14:13 | [4db3ee048d] part of check-in [50ff86afd0] Add the --detail flag to the merge command. (By: drh on 2007-11-08 16:14:13) [diff] [annotate] | |
|
2007-09-17
| ||
| 01:00:32 | [246b01382f] part of check-in [f76192b245] Pulled the latest CLI, website, and sqlite changes into the importer branch. (By: aku on 2007-09-17 01:00:32) [diff] [annotate] | |
|
2007-09-11
| ||
| 02:25:19 | [246b01382f] part of check-in [a36177bcce] Add the "undo" and "redo" commands. Untested at this point so don't try to use them yet. (By: drh on 2007-09-11 02:25:19) [diff] [annotate] | |
|
2007-08-30
| ||
| 20:27:14 | [de0f1b5a76] part of check-in [4c82c7773f] Fix some annoyances with "merge". This involves a schema change to the _FOSSIL_ file. Older versions will continue to work, but it would make since to "close" and "open" local source tree after updating to this version of fossil, in order to update the schema. (By: drh on 2007-08-30 20:27:14) [diff] [annotate] | |
|
2007-08-18
| ||
| 11:42:24 | [6daf84ba0a] part of check-in [6607844a01] Added options to the "timeline" CLI command. Additional help comments. (By: drh on 2007-08-18 11:42:24) [diff] [annotate] | |
|
2007-07-21
| ||
| 14:10:57 | [c88ea8508f] part of check-in [dbda8d6ce9] Initial check-in of m1 sources. (By: drh on 2007-07-21 14:10:57) [annotate] | |