Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
113 check-ins using file www/fossil-v-git.wiki version 55072cf622
|
2010-12-22
| ||
| 14:25 | Draw inbound merge arrows on the graph even if the merge parent is off-screen. ... (check-in: e685fc0b85 user: drh tags: trunk) | |
| 01:32 | Fix up all of the test scripts so that the test results match the latest fossil output. Ticket [4f43f7ff92ae02ae3] ... (check-in: 1092a1df55 user: drh tags: trunk) | |
|
2010-12-21
| ||
| 21:32 | Merge into trunk from experimental the lookaside hit and miss stats associated with the --sqltrace option. ... (check-in: b41d0f6120 user: drh tags: trunk) | |
| 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) | |
| 20:54 | Fix a couple of out-of-order variable declarations. ... (check-in: 4a8b4210f7 user: drh tags: experimental) | |
| 20:39 | Many bug fixes while testing stash: Fix "revert" so that it updates the file status correctly. Fix several cases of "//" being used as a file separator instead of just "/". Fix undo on stash apply. Make "stash drop" undoable. Update documentation for undo and stash. ... (check-in: 8a6aa0a13f user: drh tags: experimental) | |
| 18:56 | The "stash" functionality is now in place. Need to test more prior to merging into trunk. ... (check-in: 22aa74dcdf 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) | |
|
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) | |
| 15:52 | New cloning algorithm appears to be much faster at the cost of slightly more network bandwidth. Fully backwards compatible. Need to look at the network bandwidth issue prior to merging with trunk. Perhaps a command-line option for the clone command to select between slow-and-small or fast-and-larger. ... (Closed-Leaf check-in: 8bb8be26ca user: drh tags: experimental) | |
| 13:56 | Use the built-in SQLite caseless string comparison functions instead of the C-library strcasecmp(). Accept mime-type application/x-fossil-uncompressed and avoid decompression when seen. ... (check-in: 0b6c414c6f user: drh tags: trunk) | |
|
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. ... (check-in: e154a4386b user: drh tags: trunk) | |
| 20:44 | Add the --nochange and -n options to the "merge" command. ... (check-in: 000af3234f user: drh tags: trunk) | |
| 03:31 | Ignore unfinalized statements when shutting down the SQLite command-line shell. Ticket [891cd78969e03ec3009]. ... (check-in: 31f5b295fa user: drh tags: trunk) | |
|
2010-12-07
| ||
| 14:20 | Update the precompiled download page to include an OpenBSD binary. ... (check-in: 57f374a7f4 user: drh tags: trunk) | |
| 13:31 | Update the internal SQLite to the latest 3.7.4 pre-release snapshot. ... (check-in: 0018d724b3 user: drh tags: trunk, release) | |
|
2010-12-04
| ||
| 19:25 | Basic functionality for the "bisect" command is now working. Ticket [33ffff3b4d961cf6e2a0] ... (check-in: bd75ea06b8 user: drh tags: trunk) | |
| 13:15 | Simple bug-fix to get the bisect-good and bisect-bad commands working. ... (check-in: f2dbf9017d user: drh tags: trunk) | |
| 13:07 | Begin adding a "bisect" command. The command is installed, but it does not yet work. This check-in is to facilitate transfer to a different machine. ... (check-in: 2ce65f2863 user: drh tags: trunk) | |
|
2010-12-03
| ||
| 23:49 | Fix a bug in the new content() function added to the "sql" command. Ticket [195e50e93489c4997d]. ... (check-in: 63e6cb4e58 user: drh tags: trunk) | |
| 21:06 | Fix typo in import/export documentation (ticket [a66760daeecca231d84]). Add flexibility to the command-line options to import/export to accommodate future enhancements. ... (check-in: 1b53667d28 user: drh tags: trunk) | |
|
2010-12-02
| ||
| 14:46 | Remove some instances of strcpy() and sprintf() due to warnings on OpenBSD. Update the internal SQLite to the latest 3.7.4 release candidate. ... (check-in: 3ad5891c72 user: drh tags: trunk) | |
|
2010-11-26
| ||
| 18:43 | Fix and out-of-order variable definition in the "sqlite3" command. ... (check-in: f105bc17a0 user: drh tags: trunk) | |
| 18:37 | Report an error if the repository schema version does not match what the fossil executable expects. ... (check-in: c0c3d92340 user: drh tags: trunk) | |
| 17:41 | Update the built-in SQLite to the latest 3.7.4 beta. ... (check-in: 6c73321418 user: drh tags: trunk) | |
|
2010-11-25
| ||
| 20:31 | merged in makemake.tcl updates ... (check-in: ac5e8fb4c0 user: wolfgang tags: trunk) | |
| 20:24 | added pellesc make to makemake.tcl ... (check-in: 65dd90fb95 user: wolfgang tags: trunk) | |
| 02:51 | On the timeline, the t=TAG query parameter can refer to tags on events in addition to check-ins. ... (check-in: 4438e96abc user: drh tags: trunk) | |
| 02:42 | Remove the "Leaves" menu-bar item from the default setup. ... (check-in: f5efd3f359 user: drh tags: trunk) | |
| 01:52 | When attempting to "fossil update" on a closed branch, move to the end of the branch. Ticket [375e5703329a743339] ... (check-in: 1719815a47 user: drh tags: trunk) | |
| 00:17 | Add a new link to the check-in "info" page that goes to a timeline showing just the immediate parents and children of a check-in. Ticket [746949c9318554c137f5]. ... (check-in: 8c04a873c8 user: drh tags: trunk) | |
|
2010-11-24
| ||
| 23:45 | If the date of a check-in has been changed by a tag, then show that fact on the "info" page for the check-in. <i>Requires a rebuild</i>. ... (check-in: 576f6db2a8 user: drh tags: trunk) | |
| 22:43 | updated makemkae.tcl to generate proper Makefile.dmc ... (check-in: d19fd0bf8c user: wolfgang tags: trunk) | |
| 21:32 | Tag the manifest of every "private" checkin with the "private" tag. After the "reconstruct" command, add all private checkins to the private table. Ticket [e29ea5912afe1e97]. ... (check-in: 3b2d67d604 user: drh tags: trunk) | |
| 20:54 | add sqlcmd to Makefile.dmc ... (check-in: 1ee56c4201 user: wolfgang tags: trunk) | |
| 17:30 | Fix a redirect loop problem for the /home URL. Ticket [77dc5de6397fb18c0fbad] ... (check-in: 135fcbbb05 user: drh tags: trunk) | |
| 17:13 | Correctly handle partial commits even when files have been deleted and/or renamed and are not part of the partial commit. Tickets [ad15a8e2af8c3162d6] and [5cc33a6aa0621be8936f]. ... (check-in: 2ceeeca19d user: drh tags: trunk) | |
| 12:03 | Factor the sql-command shell out into a separate source file. Add the new content(X) SQL function for accessing uncompressed and undeltaed artifact content. ... (check-in: b4687be448 user: drh tags: trunk) | |
|
2010-11-23
| ||
| 22:18 | Fix the ticket-change artifact generator so that it puts all fields with the "+" prefix on their name first, where they ought to be. ... (check-in: e1dac0e4f6 user: drh tags: trunk) | |
|
2010-11-19
| ||
| 22:29 | Further work on getting a "commit" or "update" to continue operating after an autosync failure. The "commit" command prompts to verify that you want to continue. ... (check-in: 0cc4875fde user: drh tags: trunk) | |
| 19:48 | Work toward getting and "update" or "commit" to continue even after an auto-sync failure. ... (check-in: 9286aaf778 user: drh tags: trunk) | |
|
2010-11-17
| ||
| 20:11 | integrate import/export to Makefile.dmc ... (check-in: e5d99df4bc user: wolfgang tags: trunk) | |
| 13:38 | Tweaks to the graph layout. Add a graph to ticket timelines. ... (check-in: cf178577ec user: drh tags: trunk, release) | |
| 13:15 | Set binary translation mode on windows for import and export. Ticket [feeb8a91eb838f743ae9] ... (check-in: b408ece7f6 user: drh tags: trunk) | |
|
2010-11-16
| ||
| 23:16 | Update to the latest version of SQLite with the sqlite3_stmt_readonly() capability and use that interface for additional security of the user-entered SQL in the ticket report logic. ... (check-in: 115f3ea60e user: drh tags: trunk) | |
| 18:02 | Additional fixes to the "fossil import" command. Correct handling of zero-length content files. Correct handling of merges with no new or modified files. ... (check-in: 3873aa7ecb user: drh tags: trunk) | |
| 04:18 | Fix a bug in the Git import routine. ... (check-in: 9c31866404 user: drh tags: trunk) | |
|
2010-11-15
| ||
| 20:10 | Do not use the "time_fudge" temp-table if it has not been created by a prior call to manifest_crosslink_begin(). Ticket [289844a2cb535a465] ... (check-in: 80c42a3312 user: drh tags: trunk) | |
| 20:07 | Update the built-in SQLite to an alpha of version 3.7.4. ... (check-in: ea442f3704 user: drh tags: trunk) | |
| 19:50 | Fix graph display for file history. Tickets [5c7565d157b13fe0c30b7] and [a734fe24da8f75758cf4]. ... (check-in: bb045dbdbd user: drh tags: trunk) | |
|
2010-11-13
| ||
| 23:45 | Change the "branch list" command to provide output more like Git. ... (check-in: 761a6a9dcf user: drh tags: trunk) | |
| 23:29 | Disable automatic pull of shun records for the time being. ... (check-in: 3c2500c765 user: drh tags: trunk) | |
| 23:23 | Move the "updated-to:" text to the end of the display for the "update" command, and separately from the changed files by "---------". This at the request of the emacs integration effort. ... (check-in: 3af6cf0993 user: drh tags: trunk) | |
| 12:48 | On a "tree checksum does not match repository" error on a commit, go back and do a file-by-file comparison of the repository and the working checkout to try to discover what the problem is. Ticket [a483f0ab3f0d4da0]. ... (check-in: 64459dd091 user: drh tags: trunk) | |
| 02:17 | Fixed typo in the help message for the deconstruct command ... (check-in: f7cf6dd7ba user: aku tags: trunk) | |
| 02:16 | Fixed typos in commit [aa2fdc286c]. ... (check-in: 8cf380a48e user: aku tags: trunk) | |
| 01:56 | Refinements to the "sync protocol" document. ... (check-in: aa2fdc286c user: drh tags: trunk) | |
|
2010-11-12
| ||
| 23:27 | More typos in the fossil-v-git document. ... (check-in: a17ed85c08 user: drh tags: trunk) | |