Fossil

Timeline
Login

Timeline

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

50 check-ins related to "trunk" plus check-in "2010-12-18 01:46:31" occurring around 2010-12-18 01:46:31.

2010-12-21
20:35
Back out check-in [34341a10b45c9ff1] which was incorrect. That check-in was causing incorrect results to display on the diff of an uncommitted merge. Ticket [47d4e76139fd63f2a] is still open. ... (check-in: 1bea7f6959 user: drh tags: trunk)
16:30
Corrected help message for the <tt>stash</tt> command ... (check-in: fbddb08908 user: BM tags: trunk)
16:26
Bug fix for large syncs involving delta-manifests. ... (check-in: 8837795f53 user: drh tags: trunk)
15:28
Change the --httptrace option to store both the request and the reply in separate text files. Nothing is sent to stderr any more. ... (check-in: abe892304a user: drh tags: trunk)
14:13
Fix a typo in the "setup_access" screen. Ticket [6a70408ccb230a20856117] ... (check-in: 13920cd0f4 user: drh tags: trunk)
13:56
Updates to the download page generator script. ... (check-in: 09fc7be1f0 user: drh tags: trunk)
12:24
Fix the "make clean" to recursively remove subdirectories in the OBJDIR directory. Ticket [950d0186f84f38d2] ... (check-in: 1710ccf931 user: drh tags: trunk)
2010-12-20
22:00
Reduce the default maximum download limit from 20M to 5M since the smaller size seems to work much better with the latest clone refinements. ... (check-in: d16ccde510 user: drh tags: trunk)
17:29
Fix an off-by-one error in the delta generator. ... (check-in: d7dfb5ae42 user: drh tags: trunk)
16:57
Additional lookaside buffer measurements associated with an experimental version of SQLite, enabled only when --sqltrace is used. ... (Closed-Leaf check-in: 9688ec1d00 user: drh tags: experimental)
14:52
Update the --sqltrace debugging option so that it outputs memory usage statistics within SQL comments. ... (check-in: cb745cc789 user: drh tags: trunk)
13:15
Update the unix Makefile to shift all build products other than the file executable into the OBJDIR folder. ... (check-in: e084092a07 user: drh tags: trunk)
12:49
Get the --ignore option and ignore-glob setting working for the "clean" command. Ticket [0bc90d7235404d16]. ... (check-in: f12a6962a7 user: drh tags: trunk)
02:14
For clone and sync, report the correct network traffic totals even if those totals exceed 2 GiB. ... (check-in: a9e05e23e9 user: drh tags: trunk)
02:02
Abort a clone and delete the new repository if the server for the clone returns an error during the sync. ... (check-in: f6263ed6ce user: drh tags: trunk)
01:06
Improvements to the graph layout algorithm yielding a more compact graph in many cases. ... (check-in: ea61f4aa55 user: drh tags: trunk)
2010-12-19
21:08
When an ambiguous command prefix is entered, report all possible matches as part of the error message. ... (check-in: 5ae54b39fd user: drh tags: trunk)
20:59
Added a permuted documentation index. ... (check-in: 169a10dd5e user: drh tags: trunk)
02:09
Clear compiler warnings on OpenBSD. No functional code changes. ... (check-in: bbbb35a3c6 user: drh tags: trunk)
2010-12-18
23:59
For the git-fast-export interchange format, make sure labels for blobs and labels for check-ins do not collide since git cannot deal with that. Ticket [536c3399075d06] ... (check-in: d45502b066 user: drh tags: trunk)
22:25
Get the "stash save" command working for the case when a directory is specified as an argument. ... (check-in: fc6aea52ba user: drh tags: trunk)
21:26
Bring the "stash" enhancement into the trunk. ... (check-in: 12a2a5eaf2 user: drh tags: trunk)
21:22
Add the "stash diff" and "stash gdiff" commands. ... (Closed-Leaf check-in: 987e0ff78d user: drh tags: experimental)
17:24
Begin adding code to implement the "stash" command. The code compiles and runs but is currently incomplete. This is an incremental check-in to preserve state. (Ironically, if "stash" were working, I'd have probably just done a "stash snapshot" to capture this state, rather than an experimental branch.) ... (check-in: b3dadcc4a6 user: drh tags: experimental)
14:18
Simplifications to the implementation of undo/redo. Add the --explain option to undo/redo that shows what would be undone or redone without actually doing anything. ... (check-in: 30981b64a4 user: drh tags: trunk)
01:46
Fix the tag propagator so that when a non-propagating tag overrides a propagating tag, the propagation is undo. Ticket [fcadf658ed282b3a2] ... (check-in: 6007b2075c user: drh tags: trunk)
01:38
Fix the check-in editor so that it does not try to change the date on every edit of the check-in, but only on edits that actually change the date. ... (check-in: b230721eb8 user: drh tags: trunk)
2010-12-17
21:06
In the check-in property editor, change the bgcolor tag even if the only change is to toggle color propagation on or off. Ticket [fcadf658ed282b3a2]. ... (check-in: 2080d52168 user: drh tags: trunk)
12:41
When "fossil set editor" is unset and when there is no EDITOR or VISUAL environment variable set, then gather the check-in comment from standard input (with appropriate prompting) rather than trying to run "ed" or "notepad". ... (check-in: aa929c4d1e user: drh tags: trunk)
12:13
Issue a warning to the user before using "ed" or "notepad" if no default text editor is set. ... (check-in: 115d90d8b0 user: drh tags: trunk)
12:03
Remember which database was opened first (as the "main" database) in the g.zMainDbType global variable. ... (check-in: 99f52f3806 user: drh tags: trunk)
2010-12-16
15:03
Tweaks to the merge conflict notation. ... (check-in: bf919337bb user: drh tags: trunk)
14:46
Use relative URLs for hyperlinks whereever possible, so that Fossil can work better behind a reverse proxy. ... (check-in: daeb10f65f user: drh tags: trunk)
2010-12-15
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)
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)