Timeline
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

50 events occurring around f2912c95cc6a8ee7.

2010-12-16
11:25 Ticket [1e8b4d2ef3] No manifest.uuid in downloaded zip file status still Closed with 1 other change artifact: 03e363be7e user: eric ... 2 similar events omitted.
2010-12-15
18:16 Ticket [b14f878819] Line ending changes cause fossil to not detect differences for commit status still Open with 1 other change artifact: d8d19ba769 user: venks ... 3 similar events omitted.
02:42
Fix an uninitialized variable in update. check-in: e3313965d3 user: drh tags: trunk
02:19
Make three new TH1 variables available the footer on /doc pages: $doc_name, $doc_version, and $doc_date. check-in: 1b0e6c0fbb user: drh tags: trunk
01:49
Report the number of conflicts at the end of a merge or update and offer a hint to the user about the "fossil undo" command. check-in: 070ce24d83 user: drh tags: trunk
01:36
Change the merge conflict marks to identify which part is original content and which part is the content merged in. check-in: 76ae862ec9 user: drh tags: trunk
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
14:54 Ticket [10eca88793] Wanting to create Package for Arch Linux status still Open with 2 other changes artifact: d0da9a961a user: anonymous
10:35 Ticket [e6b127d7a7] Events cannot have attachments, and wiki pages can status still Open with 3 other changes artifact: 246b0d26c7 user: anonymous
00:36
Merge in the experimental clone speed enhancement. check-in: 3543ed62bb user: drh tags: trunk
00:31 Fixed ticket [33d2bf3988]: "fossil update" should get current branch if multiple descendants plus 1 other change artifact: 3a85fe76b6 user: drh
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 Fixed ticket [a470443b64]: Option to suppress hex dump on artifact page plus 1 other change artifact: be69d7345d user: drh
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:27 New ticket [10eca88793] Wanting to create Package for Arch Linux. artifact: 04fc68806a user: anonymous
23:07 Add attachment "suppress-hex.patch" to ticket [a470443b64] artifact: 9eb7893379 user: anonymous
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
23:03 New ticket [a470443b64] Option to suppress hex dump on artifact page. artifact: b01827dd89 user: anonymous
21:35 Ticket [b6579b1ec1] Update with a merge fails on unicode files status still Open with 1 other change artifact: f2912c95cc user: anonymous
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
17:07 New ticket [33d2bf3988] "fossil update" should get current branch if multiple descendants. artifact: 3dd7622719 user: ron
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-12
23:44 Edit [34341a10b45c9ff1]: Edit check-in comment. Timestamp 2010-12-10 18:57:50. artifact: ebb062fd9a user: drh
18:14 New ticket [d22946aa0c] Adding files with non-English file names is not cross-platform. artifact: 7b1ce666a7 user: anonymous
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
14:53 Ticket [4ee4aa5a30] import does not work with file- or directorynames containing whitespace status still Fixed with 1 other change artifact: 9b24ea7503 user: drh ... 1 similar event omitted.
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
20:10 Ticket [4ee4aa5a30] import does not work with file- or directorynames containing whitespace status still Open with 2 other changes artifact: b57baea2f9 user: anonymous ... 1 similar event omitted.
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
17:24 Ticket [47d4e76139] tree checksum does not match manifest after commit status still Open with 1 other change artifact: 1897b94039 user: anonymous ... 4 similar events omitted.