Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
119 check-ins using file src/merge.c version bc479ffc71
|
2018-08-02
| ||
| 08:10 | Create new branch named "cmake-ide" ... (check-in: 2150860bed user: ashepilko tags: cmake-ide) | |
|
2011-08-30
| ||
| 08:00 | More comments about tests I'd like to write. ... (check-in: 281e5121e7 user: viriketo tags: merge_renames) | |
|
2011-08-05
| ||
| 12:43 | Taking a note about a new test I should write about merges with renames.. ... (check-in: b78d999988 user: viriketo tags: merge_renames) | |
|
2011-08-04
| ||
| 14:32 | Merge the ben-minorchanges branch into trunk. ... (check-in: 83c032de7f user: drh tags: trunk) | |
|
2011-08-02
| ||
| 18:42 | Use the automatic background color algorithm for individual file timelines in addition to the global timeline. ... (check-in: abe7b8335f user: drh tags: trunk) | |
|
2011-07-30
| ||
| 10:14 | Correct the winsrv documentation to use the renamed command name. ... (Closed-Leaf check-in: f6b8397e4b user: ben tags: ben-minorchanges) | |
| 10:10 | Allow more than one file to be specified to the diff command. ... (check-in: 3cdcb51573 user: ben tags: ben-minorchanges) | |
|
2011-07-28
| ||
| 19:57 | Merge Joerg's export command improvements into trunk. ... (check-in: dd74352d2c user: drh tags: trunk) | |
|
2011-07-25
| ||
| 12:24 | Make sure deleted files are recorded in the MLINK table. ... (check-in: ccc2c8f65e user: drh tags: trunk) | |
| 11:21 | Merge the ge-tarfix changes into trunk. This fixes tarball generation for repos that have very long filenames. ... (check-in: a26940c22e user: drh tags: trunk) | |
|
2011-07-24
| ||
| 19:47 | Use a Blob object rather than a custom printf function in order to construct the PAX header for tarballs. ... (Closed-Leaf check-in: 02ce8b4a46 user: drh tags: ge-tarfix) | |
| 00:36 | Improvements to tar generation. Uses the format documented in Posix.1-2008 to handle long file names and UTF-8. ... (check-in: 2ef37b3b2a user: ge tags: ge-tarfix) | |
|
2011-07-23
| ||
| 23:01 | Fix logic error: look up mlink entries of the commit, not the parent. ... (Closed-Leaf check-in: 9a67937056 user: joerg tags: experimental) | |
| 22:13 | Fix a harmless compiler warning. ... (check-in: ba15af450d user: drh tags: trunk) | |
| 22:05 | Improvements to the automatic background color chooser. Provide a setting which alters the algorithm to work with a light-color foreground. ... (check-in: ce4a44d931 user: drh tags: trunk) | |
| 21:32 | Add MinGW makefile to allow building an SSL-enabled Fossil with the sources for zlib and OpenSSL simply extracted into the Fossil source directory. ... (Closed-Leaf check-in: 6652dd1c17 user: mistachkin tags: mistachkin-Makefile) | |
| 16:01 | Merge the autosetup update into trunk. ... (check-in: 3c512b3748 user: drh tags: trunk) | |
| 00:24 | During the first phase of export, explicitly try to process the commits in order of delta chains to minimize recomputation and cache trashing. ... (check-in: 2cfb415b23 user: joerg tags: experimental) | |
|
2011-07-22
| ||
| 23:46 | If a branch does not have a color set for it, choose a background color for the timeline background based on a hash of the branch name. ... (check-in: c946b573c7 user: drh tags: trunk) | |
| 23:15 | Experimental query parameters brbg and ubg for the timeline. ... (check-in: b6b419c32d user: drh tags: trunk) | |
| 22:07 | Update autosetup to the latest version. This fixes bootstrap on systems with older compilers. Now './configure; make' works on Haiku R1/Alpha 3. ... (Closed-Leaf check-in: c32b23d626 user: steveb tags: autosetup) | |
| 19:38 | Since the mlink table contains entries with pid=0 for non-empty manifests without parents, drop the original non-incremental commit logic by folding the few special cases into the mlink/plink based output. ... (check-in: fca3073621 user: joerg tags: trunk) | |
| 03:12 | Merge the recent autosetup changes into trunk. The Makefile has been renamed to Makefile.classic. The standard procedure to build is now ./configure; make. ... (check-in: 75f02948fa user: drh tags: trunk) | |
| 03:10 | Very minor edits to the BUILD.txt document. ... (Closed-Leaf check-in: 38d5859713 user: drh tags: autosetup) | |
| 01:43 | Switch to using configure (autosetup) by default. The original Makefile is now available as Makefile.classic ... (check-in: eff52c1ccb user: steveb tags: autosetup) | |
|
2011-07-21
| ||
| 19:20 | Add support for incremental exports ... (check-in: c2ccd82522 user: joerg tags: trunk) | |
| 17:37 | Use stable marks derived from the rid in preparation for optional incremental exports. ... (check-in: 22d414e517 user: joerg tags: trunk) | |
| 17:35 | Skip missing merge parents. Git doesn't like missing marks and there isn't anything to be done about them. ... (check-in: b71b32d131 user: joerg tags: trunk) | |
| 15:50 | Avoid parsing manifests if a parent exists. Now the only case left using deleteall is when no parent exists. ... (check-in: bc8d368b66 user: joerg tags: trunk) | |
| 13:53 | Write incremental file lists for fast-export. ... (check-in: 433a3c9a78 user: joerg tags: trunk) | |
|
2011-07-20
| ||
| 20:05 | Fix the realclean target on windows makefiles to delete mkversion.exe not version.exe. Ticket [5947ace466c571d] ... (check-in: 3ade77897f user: drh tags: trunk) | |
| 09:09 | Only allow the default Makefile to build fossil on platforms where it's known to work. Update the build documentation to tell the user to use the GNUmakefile explicitly, to avoid accidently building using the default makefile on non-GNU platforms. ... (Closed-Leaf check-in: 14d1e44957 user: ben tags: ben-safe-make) | |
| 08:34 | Add help text to status command about --non-relative option. ... (Closed-Leaf check-in: 5de11ac6be user: ben tags: ben-changes-report) | |
|
2011-07-19
| ||
| 23:44 | Update the built-in SQLite to the latest 3.7.8 alpha, for the purpose of testing SQLite. ... (check-in: 4adc11edb7 user: drh tags: trunk) | |
| 23:29 | Allow the root of a check-out to be in the root of the filesystem. Ticket [675f36eac4902cf] ... (check-in: b317471d8c user: drh tags: trunk) | |
| 23:18 | Do not delete initial whitespace from a wiki page prior to formatting as this can mess up the bullet and enumeration markup. Ticket [207829a5c5ab7af] ... (check-in: 4ac6328f76 user: drh tags: trunk) | |
| 23:10 | Enhance the branch command and the branch www page so that they can show all branches. The branch command can now also show closed branches. Ticket [2adfb697fda1b2]. ... (check-in: ebeaf3ae26 user: drh tags: trunk) | |
| 22:57 | Take extra care to always honor the -A option on clone, especially when cloning from a file: URI. Ticket [bcd3cdebf2879874] ... (check-in: d86201dce9 user: drh tags: trunk) | |
| 22:41 | Increment the version number. Update the change log. ... (check-in: a3717e1378 user: drh tags: trunk) | |
| 22:39 | Change the name of the "service" command to "winsrv" to avoid confusion with the "server" command. ... (check-in: c46c70897c user: drh tags: trunk) | |
|
2011-07-18
| ||
| 20:04 | Merge the windows-service command into trunk. ... (check-in: 06e9ca23e7 user: drh tags: trunk) | |
| 20:00 | Update the MSVC makefile so that it works with the new "service" command. ... (Closed-Leaf check-in: 4bf9048e25 user: drh tags: tsbg-win-service) | |
|
2011-07-15
| ||
| 18:06 | Enable Fossil to run as a Windows service and add a "fossil service" command. ... (check-in: 91c2f65a6e user: tsbg tags: tsbg-win-service) | |
| 04:50 | Add file local.tcl to the autosetup directory. Containing a configuration option to prevent autosetup from using a pager. ... (check-in: e14f0fe2f3 user: dan tags: trunk) | |
|
2011-07-14
| ||
| 15:28 | Add a commentary section to the check-in checklist. Also add the "verify makefiles" item. [/doc/trunk/www/checkin.wiki] ... (check-in: 39624620ac user: drh tags: trunk) | |
| 14:34 | Update autosetup to the latest version - https://github.com/msteveb/autosetup/commit/e2a8949b420 . ... (check-in: a4efad7e61 user: dan tags: trunk) | |
| 13:29 | Update the pre-commit checklist: [/doc/trunk/www/checkin.wiki] ... (check-in: 831306e11b user: drh tags: trunk) | |
| 13:02 | Added the Checklist for Successful Open-Source Projects document. [/doc/trunk/www/foss-cklist.wiki] ... (check-in: 34177b0068 user: drh tags: trunk) | |
| 11:24 | Fix the "fossil setting" command so that it can change the manifest setting even when not within a local check-out. ... (check-in: fd13b1a16f user: drh tags: trunk) | |
| 11:09 | Modify auto.def to detect the case where the system SQLite is too old for WAL support (used by fossil). ... (check-in: 5fe55cb103 user: dan tags: trunk) | |
| 10:24 | Small changes to autosetup build system so that the --disable-internal-sqlite switch works and is compatible with BSD make. ... (check-in: 734af429e3 user: dan tags: trunk) | |
| 00:28 | Fix a bug in the auto.def file. ... (check-in: 35f80429f2 user: drh tags: trunk) | |
|
2011-07-13
| ||
| 23:03 | Version 1.18 ... (check-in: df9da91ba8 user: drh tags: trunk, release, version-1.18) | |
| 21:29 | Merge the new autosetup mechanism into the trunk. ... (check-in: f476744d60 user: drh tags: trunk) | |
| 21:24 | Update the "fossil wiki export" command to use standard file output utilities so that line endings will be handled correctly. Ticket [d9040c134bf41] ... (check-in: 11f2f71f4c user: drh tags: trunk) | |
| 21:15 | Fix an assert() that fires if the "stash" command is used after having done an "rm". Ticket [3ce0ea97522581] ... (check-in: 336e194c4d user: drh tags: trunk) | |
|
2011-07-12
| ||
| 20:27 | Be sure to flush g.httpOut at the end of cgi_reply(). ... (check-in: 2cd0c7657f user: drh tags: trunk) | |
| 17:26 | Apply a fix to auto.def supplied by Steve Bennett via the mailing list. ... (Closed-Leaf check-in: 8c482e2a99 user: dan tags: autosetup) | |
|
2011-07-11
| ||
| 10:00 | By default, the extras command lists all the uncontrolled files relative to the current working directory, unless the --non-relative option is used. ... (check-in: b9a38cf367 user: ben tags: ben-changes-report) | |
|
2011-07-10
| ||
| 15:01 | By default, the changes and status commands list all changed files relative to the current working directory, unless the --non-relative option is used. ... (check-in: a05bbff46a user: ben tags: ben-changes-report) | |
| 13:01 | When running the changes or status command from inside a sub-directory of the check out, only show the changes in or below the current directory unless the --show-all option is used. ... (check-in: e0d2e1f9b8 user: ben tags: ben-changes-report) | |
| 12:05 | Don't show the cookie values on the test_env page, unless the fossil executable was built with FOSSIL_DEBUG. ... (check-in: 35ecc92b69 user: ben tags: trunk) | |
|
2011-07-09
| ||
| 21:06 | Disable the piping of output through $env(PAGER). ... (check-in: cd2cb3b347 user: drh tags: autosetup) | |
| 20:19 | Initial check-in of Steve Bennett's autosetup configurator. ... (check-in: ded86a4e53 user: drh tags: autosetup) | |
| 16:12 | Added ability to access repositories via CGI that are located in a path containing whitespaces. ... (check-in: fc15fe0418 user: rimkojr tags: trunk) | |
|
2011-06-30
| ||
| 17:40 | typo fix per ticket [fc0838fc72f079d2033ae] ... (check-in: e50813e19b user: bch tags: trunk) | |
|
2011-06-29
| ||
| 17:10 | Simplify some the "name" parameter to the "artifact" URIs. ... (check-in: 5acc3e4cc4 user: drh tags: trunk) | |
| 11:23 | Fix broken hyperlink on ticket history. Ticket [53ed528478dbc42]. ... (check-in: 082c02a80c user: drh tags: trunk) | |
| 11:20 | Fix the fossil_strcmp() routine so that it compares strings in the correct order even if some of the characters have their high-order bits set. Ticket [5982aa506467d]. ... (check-in: f23e90da8a user: drh tags: trunk) | |
|
2011-06-28
| ||
| 00:17 | Fix a missing dependency in the makefiles. Ticket [e5b941cb0c90ba] ... (check-in: 5392b5c28b user: drh tags: trunk) | |
|
2011-06-24
| ||
| 11:31 | Update the built-in SQLite to the 3.7.7 final with patches to fix compiler warnings associated with Fossil's use of SQLITE_THREADSAFE=0. ... (check-in: 745db63526 user: drh tags: trunk) | |
|
2011-06-23
| ||
| 17:48 | Update the build-in SQLite to the lastest 3.7.7 release candidate. ... (check-in: 4722e1ab77 user: drh tags: trunk) | |
| 11:24 | added version diff from info page ... (Closed-Leaf check-in: 6a84934b44 user: ron tags: rons diff mods) | |
| 08:56 | added "diff from other version" to fdiff page ... (check-in: b785f08608 user: ron tags: rons diff mods) | |
|
2011-06-21
| ||
| 11:38 | fix [ffa87168ce1] ... (check-in: b72eb4d4b2 user: ron tags: trunk) | |
| 00:51 | Update the built-in SQLite to the latest 3.7.7 release candidate. ... (check-in: 74cbfc69ad user: drh tags: trunk) | |
|
2011-06-19
| ||
| 16:52 | Require version 2.61 of autoconf, the version installed by default on Mac OS X. Changes to get autoconf working under Solaris 10: Prefer system version of OpenSSL found in /usr/sfw directory. Check for getpassphrase using autoconf rather than making assumptions in config.h. ... (Closed-Leaf check-in: c5f994d4c5 user: ben tags: autoconf) | |
| 16:48 | Fix syntax in Makefile.in so it works with Solaris make. ... (check-in: 4787336f2f user: ben tags: autoconf) | |
|
2011-06-18
| ||
| 19:29 | Updates to the "Quick Start" documentation. ... (check-in: a8f271e81e user: drh tags: trunk) | |
| 18:30 | Update the release-test document. Add a Change Log. ... (check-in: a992b276e1 user: drh tags: trunk) | |
| 18:06 | Add a "Contributing" link to the homepage. Update the build documentation. ... (check-in: 2d50893dd8 user: drh tags: trunk) | |
| 17:02 | Fixes to the windows makefiles to support sequential version numbers. ... (check-in: 30b0986d93 user: drh tags: trunk) | |
| 16:50 | Add a version number that is increased by one on each release. Make the initial version number 1.18 since there have been 17 prior releases. ... (check-in: e0303181a5 user: drh tags: trunk) | |
| 15:51 | Improved error messages when getcwd() fails. Ticket [f628d183c958c5b12]. ... (check-in: 89e6eb9674 user: drh tags: trunk) | |
|
2011-06-17
| ||
| 20:13 | Adding a new test (this failed by current trunk) based on ticket [74413366fe]. ... (check-in: b2e7370e32 user: viric tags: merge_renames) | |
| 19:09 | Adding a first test for merging branches with renames. Related to ticket [554f44ee74]. ... (check-in: 8526b151fc user: viriketo tags: merge_renames) | |
| 15:13 | Fixes to "export --git". Changes spaces in tag names to "_" since Git cannot deal with spaces in tag names. Make sure the name of the committer is well-formed according to git's definition of well-formedness. ... (check-in: b707622f29 user: drh tags: trunk) | |
| 13:37 | Fix the temporary filename generator so that it does not get stuck in a loop. Ticket [006e1df642d6246a03]. ... (check-in: d3a1663a09 user: drh tags: trunk) | |
|
2011-06-16
| ||
| 23:14 | A CMake file from Thomas Schnurrenberger. Saved for reference. After some experimentation with cmake, the thinking is we will probably go in a different direction. ... (Closed-Leaf check-in: d167b79e66 user: drh tags: cmake) | |
| 23:12 | Fix an issue with makeheaders that causes problems for windows when full pathnames are use with a colon in the device name. ... (check-in: 1128509646 user: drh tags: trunk) | |
| 19:51 | Updates to the VC++ makefile. ... (check-in: 82d741db3e user: drh tags: trunk) | |
|
2011-06-15
| ||
| 15:33 | Add the configure script and merge in the latest trunk changes. ... (check-in: 57ca24966f user: drh tags: autoconf) | |
| 15:22 | Update the built-in SQLite to the latest 3.7.7 beta. ... (check-in: dbe1e68e43 user: drh tags: trunk) | |
|
2011-06-14
| ||
| 23:59 | When doing a merge, only follow direct ancestor links when computing the set of filename changes. Do not follow merge links as this can result in non-intuitive changes. Ticket [554f44ee74e3d3b]. ... (check-in: 1c4d1272a6 user: drh tags: trunk) | |
| 22:31 | Disable several warnings about sorting w/o an index. ... (check-in: b893eb0dad user: drh tags: trunk) | |
| 22:16 | A very simple commit fix. ... (check-in: 3a610a3980 user: drh tags: trunk) | |
| 17:24 | Change the minimum required autoconf from 2.67 to 2.62. ... (check-in: 0241d75a90 user: drh tags: autoconf) | |
| 17:21 | Add Makefile.in forgotten in [8559c781c2]. ... (check-in: dcda2dbcb0 user: joerg tags: autoconf) | |
| 17:10 | Remove NetBSD RCS ID ... (check-in: 8079974223 user: joerg tags: autoconf) | |
| 17:09 | Add very basic configure script. It is just checking for zlib, OpenSSL and the USE_PREAD support on the BSDs. ... (check-in: 8559c781c2 user: joerg tags: autoconf) | |
|
2011-06-10
| ||
| 15:14 | When creating manifest files as part of a "fossil import" command, ensure that "T" cards are added in sorted order, and that there are no duplicates. ... (check-in: 6ed7ceb1de user: dan tags: trunk) | |
|
2011-06-09
| ||
| 19:20 | Make sure the content of a manifest has been materialized and is not a copy-or-write segment of another blob prior to parsing it. Ticket [9c3e2a224b6b0055] ... (check-in: 0538980488 user: drh tags: trunk) | |
|
2011-06-07
| ||
| 15:51 | Improvements to the "annotate" algorithm: Only search primary ancestors; ignore branchs. ... (check-in: 621be70494 user: drh tags: trunk) | |
| 02:09 | Merge the venks-emacs changes into trunk. ... (check-in: fbf417b681 user: drh tags: trunk) | |
| 00:48 | Pull the latest trunk changes into the venks-emacs branch. ... (check-in: 690ba8cbdb user: drh tags: venks-emacs) | |
|
2011-06-06
| ||
| 17:59 | Fix indentation and tabs to style guide ... (check-in: 081a29c0b7 user: venkat tags: venks-emacs) | |
| 17:17 | When setting execute permission only set it for those users that also have read permission. ... (check-in: fd6f1c5e61 user: drh tags: trunk) | |
| 17:15 | Bug fix: make sure "fossil update" sets the execute permission bit correctly. ... (check-in: 37c231b11d user: drh tags: trunk) | |
| 16:50 | Remove an unnecessary level of function nesting. ... (check-in: 12989181a6 user: drh tags: trunk) | |
| 12:01 | Update the "scrub" command to remove traces of login-groups and subrepositories. ... (check-in: 5ea9cf4002 user: drh tags: trunk) | |
|
2011-06-05
| ||
| 00:09 | Fix minor typo in comment ... (check-in: ac7be7fd6c user: venkat tags: venks-emacs) | |
| 00:04 | Add ability to append to ticket fields from the fossil ticket command ... (check-in: 35d6029a13 user: venkat tags: venks-emacs) | |
|
2011-06-03
| ||
| 14:24 | Update the built-in SQLite to the latest 3.7.7 alpha. ... (check-in: 9f9047d686 user: drh tags: trunk) | |
|
2011-06-02
| ||
| 20:49 | Improved handling of check-in diff display when files have changed names but are otherwise unmodified. Requires a rebuild to get the display exactly right since the MLINK table needs to be recomputed. ... (check-in: 067cda2645 user: drh tags: trunk) | |
| 19:31 | Merge SSL client certificate support from ben-security branch ... (check-in: 397f434a4d user: ben tags: ben-testing) | |
| 19:28 | Create new branch named "ben-testing" ... (check-in: 25c77401f0 user: ben tags: ben-testing) | |
| 14:56 | Make sure the built-in "now()" function is available to peer-repository connections for single-signon operations. Ticket [3233c3dad99d57ad]. ... (check-in: 74ecc4d646 user: drh tags: trunk) | |
|
2011-06-01
| ||
| 22:39 | Add the --type option to the "fossil tag find" command. Ticket [9bed1f604e0773] ... (check-in: d5b9674ec5 user: drh tags: trunk) | |
| 22:32 | In contexts where only a check-out makes since, only resolve tags or branch names into check-outs, not events or other artifacts. Ticket [5f611295e3c2a8]. ... (check-in: 2a013f0228 user: drh tags: trunk) | |