Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Ancestors of file src/merge.c from check-in 70744b76e6
|
2010-12-11
| ||
| 20:08 | When merging in a change where a file was deleted in the change, actually remove the file from the working checkout. Update the test cases to verify this is what happens. file: [fda84c2a34] check-in: [70744b76e6] user: drh branch: trunk, size: 10229 | |
|
2010-12-08
| ||
| 21:00 | Add the --sha1sum option to the "status" and "changes" commands to force a detailed (but slow) SHA1 checksum verification that files have not changed. file: [022e558733] check-in: [e154a4386b] user: drh branch: trunk, size: 10628 | |
| 20:44 | Add the --nochange and -n options to the "merge" command. file: [87644798a5] check-in: [000af3234f] user: drh branch: trunk, size: 10625 | |
|
2010-11-08
| ||
| 15:33 | Fix a typo in an error message in the merge logic. file: [0112468758] check-in: [370a89c832] user: drh branch: trunk, size: 10251 | |
| 15:13 | Allow merges against an empty branch. Ticket [144180bf7db83724a9]. file: [8c80e05bd3] check-in: [4e3cd6ce4e] user: drh branch: trunk, size: 10250 | |
|
2010-06-23
| ||
| 13:30 | Prompt the user for permission to overwrite files on "fossil open". Ticket [17389900b2e5bd816] file: [8046331529] check-in: [d778ffea81] user: drh branch: trunk, size: 10334 | |
|
2010-05-16
| ||
| 19:08 | Change from GPL to the Simplified BSD License. file: [324d1004f2] check-in: [c06edd231f] user: drh branch: clear-title, size: 10328 | |
|
2010-03-18
| ||
| 14:40 | Merge in all of the latest clear-title changes from the trunk. file: [b7d15ae3ad] check-in: [7c2577bd63] user: drh branch: clear-title, size: 10604 | |
|
2010-01-21
| ||
| 22:06 | Updated to include all the latest changes (for which we hold clear title) from the trunk. file: [a03711bee2] check-in: [390b414605] user: drh branch: clear-title, size: 9606 | |
|
2010-01-14
| ||
| 15:34 | If a "merge" or "update" or "revert" fails, then automatically rollback any partial changes to the filesystem. Ticket [a9722a15d2]. file: [c13954354b] check-in: [7c3cb28d0f] user: drh branch: trunk, size: 8977 | |
|
2009-12-18
| ||
| 00:29 | Detect when the check-out contains missing files and filesystem objects that ought to be files but are not. Issue reasonable warnings. file: [1bca64b642] check-in: [76f169fca6] user: drh branch: trunk, size: 8960 | |
|
2007-12-05
| ||
| 08:07 | Merged mainline into my branch to get the newest application. file: [5979683d08] check-in: [d0305b305a] user: aku branch: trunk, size: 8957 | |
|
2007-09-17
| ||
| 01:00 | Pulled the latest CLI, website, and sqlite changes into the importer branch. file: [246b01382f] check-in: [f76192b245] user: aku branch: trunk, size: 8531 | |
|
2007-08-30
| ||
| 20:27 | 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. file: [de0f1b5a76] check-in: [4c82c7773f] user: drh branch: trunk, size: 8385 | |
|
2007-08-18
| ||
| 11:42 | Added options to the "timeline" CLI command. Additional help comments. file: [6daf84ba0a] check-in: [6607844a01] user: drh branch: trunk, size: 8346 | |
|
2007-07-21
| ||
| 14:10 | Added: Initial check-in of m1 sources. file: [c88ea8508f] check-in: [dbda8d6ce9] user: drh branch: trunk, size: 8314 | |