Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
134 check-ins using file test/merge1.test version 16644e6b61
|
2010-12-11
| ||
| 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) | |
| 22:12 | Wait to record the sync password until after the user has actually entered the sync password. Ticket [8b46db87f1bfa942b] ... (check-in: 328fc92ceb user: drh tags: trunk) | |
| 21:51 | Add the fossil_nameofexe() function to use in place of g.argv[0]. ... (check-in: a04a650870 user: drh tags: trunk) | |
| 20:57 | Fixed typos reported by ticket [a3336458f6864db0404b6d45b144be0b17526fb0]. ... (check-in: 03b53ca4ca user: aku tags: trunk) | |
| 16:37 | Incorporate the "addremove" command (with edits) from the StvPrivateHook2 branch. ... (check-in: ceab53718f user: drh tags: trunk) | |
| 15:17 | A simple tweak to the graph javascript gets it working on IE6. Ticket [a734fe24da8f75758cf] ... (check-in: e0eceb7892 user: drh tags: trunk) | |
| 00:24 | Added documentation on ways to identify a check-in. ... (check-in: aaf8cfa296 user: drh tags: trunk) | |
|
2010-11-11
| ||
| 23:08 | Change the name of the special "ckout" tag to "current". Also allow "previous" in addition to "prev" for the parent of the current checkout. ... (check-in: badb9ff231 user: drh tags: trunk) | |
| 22:04 | Add support for "magic" tags "ckout", "prev" and "next". Show the version updating to when performing an "update". ... (check-in: 5ea9ad379d user: drh tags: trunk) | |
| 21:36 | Fix a minor memory leak. ... (check-in: 3541444d9d user: drh tags: trunk) | |
| 20:33 | Further refinements to the Fossil-versus-Git document. ... (check-in: 8f4d5314ae user: drh tags: trunk) | |
| 20:01 | typo ... (check-in: 71f7103494 user: bch tags: trunk) | |
| 18:21 | Add information on the Git-to-Fossil converter and a comparison article on Fossil and Git. ... (check-in: ae0628aa99 user: drh tags: trunk) | |
| 13:36 | a stab at fast-import/export support building on the 'import' branch from drh. ... (Closed-Leaf check-in: 7043db15b8 user: gcw tags: gcw-fast) | |
| 13:36 | Fix the "fossil import" command so that it correctly handles cases where a file is deleted then replaced by a directory with the same name. ... (check-in: e5a734a19a user: drh tags: trunk) | |
| 01:16 | Cast strlen() to int when used as a printf() argument. ... (check-in: 5fa4dfc286 user: drh tags: trunk) | |
|
2010-11-10
| ||
| 21:00 | Fix a bug in processing of "merge" records for "fossil import". ... (check-in: 6b76effa92 user: drh tags: trunk) | |
| 20:56 | Improved handling of branches and tags in the "fossil import" command. ... (check-in: b2f637510a user: drh tags: trunk) | |
| 19:11 | Allow a manifest to have no F-cards. ... (check-in: 6f8cd72b08 user: drh tags: trunk) | |
| 18:44 | Drop the temporary time_fudge table once we are done with it. ... (check-in: 172e16aeec user: drh tags: trunk) | |
| 18:42 | Fix the code for adding "mlink" entries so that it records file deletions on a baseline manifest. ... (check-in: 0ba2c86d2b user: drh tags: trunk) | |
| 13:36 | Fix the "divider" lines in the timeline display. Add the --force option to the "import" command. ... (check-in: ef68b04449 user: drh tags: trunk) | |
| 01:43 | Tweak check-in times slightly so that parents always come before their children. ... (check-in: 0e87f42762 user: drh tags: trunk) | |
| 00:43 | The "fossil import" command works well enough to import the Git self-hosting repository. There are still issues and no doubt many bugs yet to be found. But this is a good start. ... (check-in: 6c827ff02e user: drh tags: trunk) | |
|
2010-11-09
| ||
| 18:15 | Partial implementation of the "fossil import" command. It is incomplete and does not work. ... (check-in: ba837f5e88 user: drh tags: trunk) | |
| 17:51 | Merge in the latest changes from venks-emacs. ... (check-in: 7d2d1d3228 user: drh tags: trunk) | |
| 17:37 | Merge with trunk ... (check-in: 96c0c68a86 user: venkat tags: venks-emacs) | |
| 13:52 | Make "init" an alias for "new". ... (check-in: 21880ca1b6 user: drh tags: trunk) | |
| 11:59 | The "export" command now exports tags. ... (check-in: 06bc2fb7cc user: drh tags: trunk) | |
| 11:05 | Merge the import/export changes into trunk. Even though they are incomplete, they do not threaten the correctness of other commands and can be developed in trunk. ... (check-in: 0f024d3e30 user: drh tags: trunk) | |
| 10:48 | Do not use a subdirectory named "obj" for building. Ticket [6e51013097c17ead]. ... (check-in: e663bac6f7 user: drh tags: trunk) | |
| 10:44 | For cloning and syncing, give all users the privileges of both "nobody" and "anonymous" without requiring a login message. Ticket [1318677c15af04480b]. ... (check-in: 134f5b374e user: drh tags: trunk) | |
| 08:59 | fix [e49f245975f89a8a9c006ec224eed48c8ad77593] by adding -nocgi option ... (check-in: 1b883d49cf user: ron tags: trunk) | |
| 01:17 | Cleanup of help_page() in preparation for merging with trunk. ... (Closed-Leaf check-in: a298a0e2f9 user: drh tags: StvPrivateHook2) | |
| 01:06 | Merge from trunk + minor changes to update.c to work with new . return from file_tree_name for fossil root. ... (check-in: a9407bc82f user: venkat tags: venks-emacs) | |
|
2010-11-08
| ||
| 23:26 | Export works for Fossil and SQLite repositories. Does not yet export tags. Also need to add incremental export. ... (Closed-Leaf check-in: e25884d44f user: drh tags: experimental) | |
| 23:01 | remove hook command to be compatible with other hook designs ... (check-in: a06121740a user: wolfgang tags: StvPrivateHook2) | |
| 20:07 | Merge in the [696668aa4ec88213c] fix, which is necessary to successfully export the Fossil self-hosting repository. ... (check-in: 95f709cd4f user: drh tags: experimental) | |
| 20:04 | merge from trunk ... (check-in: 1e801695d3 user: wolfgang tags: StvPrivateHook2) | |
| 20:01 | Fix a bug in the manifest parser which caused it to ignore manifests that were signed by a windows-build of PGP. ... (check-in: 696668aa4e user: drh tags: trunk) | |
| 19:31 | Fix an inintiialized variable in the previous check-in. ... (check-in: d8935a89b5 user: drh tags: trunk) | |
| 19:23 | Fix a corner-case in file_tree_name() - specifically when the input is the name of the root of the local tree, return ".". ... (check-in: f98114c9e4 user: drh tags: trunk) | |
| 19:02 | When the "update" command has a FILES argument which is the top-level directory, that is the same as having no FILES argument at all. In other words, all files are updated. ... (check-in: 2d1a03736a user: drh tags: trunk) | |
| 19:00 | Begin adding "import" and "export" commands for converting repositories from and to the Git format. The "export" command currently generates output but is not quite correct. The "import" command is still a stub. ... (check-in: b3fd32f925 user: drh tags: experimental) | |
| 15:33 | Fix a typo in an error message in the merge logic. ... (check-in: 370a89c832 user: drh tags: trunk) | |
| 15:13 | Allow merges against an empty branch. Ticket [144180bf7db83724a9]. ... (check-in: 4e3cd6ce4e user: drh tags: trunk) | |
| 06:15 | Remove stray debug fprintf. ... (check-in: 69e81b0260 user: venkat tags: venks-emacs) | |
| 06:13 | Fossil update -n -v current on root dir now prints all files (printed none before). ... (check-in: cbce3e2f7c user: venkat tags: venks-emacs) | |
| 05:23 | Allow fossil update -n -v current to be used on the root directory (aborted with "outside of checkout tree" error before). ... (check-in: b6bb1ee725 user: venkat tags: venks-emacs) | |
| 04:52 | merge with trunk ... (check-in: c18bbf69eb user: venkat tags: venks-emacs) | |
| 00:40 | Merge in changes from the venks-emacs branch. ... (check-in: c01e3c1794 user: drh tags: trunk) | |
|
2010-11-07
| ||
| 23:56 | Fix a typo in the <DOCTYPE> marking at the top of each webpage. Ticket [c18a77e837a66122ed19]. ... (check-in: eea8810b21 user: drh tags: trunk) | |
| 23:54 | Use the correct mimetype for the logo, even if the mimetype is not image/gif. Ticket [11209555c90f3b61e4]. ... (check-in: 5478f444c5 user: drh tags: trunk) | |
| 23:51 | Avoid the use of %lld to work around limitations of some windows compilers. Ticket [9d186979fc4fe8d9c] ... (check-in: c76bb6d270 user: drh tags: trunk) | |
| 21:11 | Patches to file.c (for mingw is_dir), finfo.c (various utilities), and update.c (for verbose/nochange), to allow integration into Emacs and IDEs. ... (check-in: 2a86bb65aa user: venkat tags: venks-emacs) | |
| 18:48 | Fix alphabetical missort. ... (check-in: d156b68672 user: venkat tags: venks-emacs) | |
| 18:42 | Send the right mime-type for svg files [2e088c5815] ... (check-in: 151a2104ae user: venkat tags: venks-emacs) | |
| 10:23 | Merge from trunk. ... (Closed-Leaf check-in: 1a6876db8d user: michael tags: ttmrichter-skins) | |
| 10:13 | merge from trunk ... (check-in: 8050311dd5 user: wolfgang tags: StvPrivateHook2) | |
| 08:16 | Create new branch named "venks-emacs" ... (check-in: e8d231aaf3 user: venkat tags: venks-emacs) | |
|
2010-11-06
| ||
| 23:59 | Add an undocumented --noverify option to the rebuild command to skip the verify_before_commit() sanity check. ... (check-in: 6a11af1782 user: drh tags: trunk) | |
| 21:04 | Rename the "portable_system()" function to "fossil_system()" and move it from diffcmd.c into main.c. ... (check-in: d9880a8003 user: drh tags: trunk) | |
| 19:08 | merge from trunk ... (check-in: e5fe4164f7 user: wolfgang tags: StvPrivateHook2) | |
| 19:04 | Add the -R option to the ticket command. ... (check-in: 6dd81a542a user: wolfgang tags: trunk) | |
| 16:57 | merge from trunk ... (check-in: 3ea66260b5 user: wolfgang tags: StvPrivateHook2) | |
| 14:04 | Fix the sync logic so that it is able to clone against the canonical fossil repository with its implied redirect. ... (check-in: a921be7b51 user: drh tags: trunk) | |
| 13:52 | Change the anonymous login cookie name to include a hash of the base URL. Ticket [3edef69bf3e995ed2] ... (check-in: 9dd6c43185 user: drh tags: trunk) | |
|
2010-11-04
| ||
| 19:58 | Do not assume that the method is CGI just because the GATEWAY_INTERFACE environment variable is set. Only do CGI if GATEWAY_INTERFACE is set and there either is no argument specified, or the specified argument is not a valid command. Ticket [e49f245975f89a8a9] ... (check-in: dcf839e4a6 user: drh tags: trunk) | |
| 19:24 | Fix a couple of minor issues with settings, as pointed out on the mailing list. ... (check-in: cb2ff51c4b user: drh tags: trunk) | |
|
2010-11-03
| ||
| 12:14 | Updates to the help text for the "commit" command. ... (check-in: 098e363301 user: drh tags: trunk) | |
|
2010-11-02
| ||
| 18:23 | merge from trunk ... (check-in: cb75de51b5 user: wolfgang tags: StvPrivateHook2) | |
| 00:07 | Add the "ignore" subcommand to the "all" command. Useful for causing testing and debugging repositories from being bypassed for "fossil all rebuild" or "fossil all sync". ... (check-in: 24636f7057 user: drh tags: trunk) | |
|
2010-11-01
| ||
| 23:45 | Mention the -N and --new-file command-line options on the "diff" command. Ticket [926a1b1639a1ee3739]. ... (check-in: bd68e4172d user: drh tags: trunk) | |
| 23:38 | Fix a possible redirect loop. ... (check-in: f4033ec09e user: drh tags: trunk) | |
| 18:52 | merge from trunk ... (check-in: 4a094f46ad user: wolfgang tags: StvPrivateHook2) | |
| 14:23 | Fix a typo in the file format documentation reported on the Tcl/Tk chatroom. ... (check-in: d0753799e4 user: drh tags: trunk, release) | |
|
2010-10-31
| ||
| 21:51 | Add a warning to the "fossil sqlite3" command to remind users that careless use of the command can easily corrupt the repository. Ticket [b18338c226f6fb4899]. ... (check-in: 4e1241f323 user: drh tags: trunk) | |
| 11:10 | makemake.tcl updated to generate valid Makefile.dmc ... (check-in: 4146190600 user: wolfgang tags: StvPrivateHook2) | |
|
2010-10-30
| ||
| 20:02 | merge from trunk ... (check-in: 943dbc556d user: wolfgang tags: StvPrivateHook2) | |
| 19:05 | applied patch from ticket [aa01499923] and added option -prot to test tcl script which optionally writes a protocol file ... (check-in: f89d953a06 user: wolfgang tags: trunk) | |