Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
10 descendants and 10 ancestors of c49ee72b09f0b565
|
2010-12-14
| ||
| 15:44 | Simplifications to the merge and update logic. Fix update so that it correctly carries file edits across name changes. ... (check-in: fd8698c8e0 user: drh tags: trunk) | |
| 00:36 | Merge in the experimental clone speed enhancement. ... (check-in: 3543ed62bb user: drh tags: trunk) | |
| 00:30 | When doing a "fossil update" if there are multiple descendents but only one descendent in the same branch as current, then go to that one descendent without complaining. Ticket [33d2bf39889352f2f] ... (check-in: 4beacb6dc4 user: drh tags: trunk) | |
| 00:15 | Do not show a hex dump by default when viewing a binary artifact. Instead, just say that the artifact contains binary data and give a "Hex" submenu to view the hex if that is what the user wants. Ticket [a470443b64412d2856]. ... (check-in: dbb02ff1f9 user: drh tags: trunk) | |
| 00:06 | Another bug fix associating with merges of branches which contain file name changes. ... (check-in: 4c95b7b950 user: drh tags: trunk) | |
|
2010-12-13
| ||
| 23:50 | Fix to the fix to the mtime race condition that was supposed to be fixed by the prior check-in. ... (check-in: fa5302c28d user: drh tags: trunk) | |
| 23:04 | Fix a long-standing mtime race condition that can cause problems if a "merge" takes places within the same second as an "update". ... (check-in: af365579e7 user: drh tags: trunk) | |
| 20:17 | Get "fossil undo" working on merges that involve name changes. ... (check-in: 5d42fe9fee user: drh tags: trunk) | |
| 20:12 | Futher enhancements to merge: Correct merging happens even on files whose names have changed since the pivot. ... (check-in: c52927c76d user: drh tags: trunk) | |
| 15:45 | Add logic for computing the closure of file name changes across a sequence of checkins. ... (check-in: 28aa0e3670 user: drh tags: trunk) | |
| 14:31 | Add the (unsupported) test-shortest-path command for finding the shortest path between two checkins in the DAG. ... (check-in: c49ee72b09 user: drh tags: trunk) | |
| 13:21 | Take into account local (uncommitted) changes when doing a merge. ... (check-in: 7ec43ccb7a user: drh tags: trunk) | |
| 00:00 | A few more merge test cases added. ... (check-in: 3f490bcbcf user: drh tags: trunk) | |
|
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. ... (check-in: 70744b76e6 user: drh tags: trunk) | |
| 16:36 | Add the --tag option to the "commit" command. Add new test cases that make use of the --tag option. Improvements to the testing infrastructure. ... (check-in: 9d723c57ea user: drh tags: trunk) | |
| 00:28 | Update the git fast-export importer so that it is able to handle filenames with spaces - or at least to the extent that the fast-export format is able to deal with such filename. Ticket [4ee4aa5a30733a] ... (check-in: 35aa6f8188 user: drh tags: trunk) | |
|
2010-12-10
| ||
| 22:02 | Create a single subroutine that determines whether a file is a "reserved" file used by Fossil itself, or is potentially a valid repository file. This processing used to be duplicated at each place where it was needed. ... (check-in: 56d69dbd85 user: drh tags: trunk) | |
| 19:28 | Do not show the "manifest" and "manifest.uuid" files as "extra" files if they are generated by Fossil. ... (check-in: 26590b8841 user: drh tags: trunk) | |
| 18:57 | Take care not to show null-diffs with the "diff" command when the checkout contains the results of a merge. Ticket [47d4e76139fd63] ... (check-in: 34341a10b4 user: drh tags: trunk) | |
| 15:25 | Fix typo in an error message. ... (check-in: 20b04536d0 user: drh tags: trunk) | |
|
2010-12-09
| ||
| 20:48 | Fix a typo in the help text for "fossil import". Ticket [e8a6bfa54e0c3] ... (check-in: 973a6b1ee8 user: drh tags: trunk) | |