Fossil

Timeline
Login

Timeline

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

120 check-ins using file src/branch.c version 3325eb2da8

2022-10-19
17:22
Fix the handling of manifest files for the "tag" and "amend" commands. ... (Leaf check-in: a233560424 user: drh tags: branch-1.37)
2017-02-17
13:23
Cherrypick [http://www.sqlite.org/src/info/810d29320b853b3a|810d29320b]: Remove the CLANG_VERSION macro, since we have learned that version numbers in clang are "marketing" and are inconsistent and unreliable. Builds using clang will still use the GCC_VERSION macro since clang works hard to be gcc compatible. ... (check-in: c453a91606 user: jan.nijtmans tags: branch-1.37)
2017-02-14
15:41
(cherry-pick): Update the built-in SQLite to version 3.17.0 ... (check-in: 17a33275f0 user: jan.nijtmans tags: branch-1.37)
2017-02-04
19:58
Improve help text for the pull/push/sync commands. ... (check-in: 04c6e7ee82 user: mistachkin tags: trunk)
2017-02-03
15:13
On diff/gdiff command, override "diff-binary" setting when argument "--diff-binary off" command line option is specified, not only with "--diff-binary on". ... (check-in: f62c247083 user: mgagnon tags: trunk)
2017-02-01
04:51
Missed one. ... (Closed-Leaf check-in: 2f19a68768 user: mistachkin tags: noSymlinks)
04:49
Reverse accidental whitespace changes. ... (check-in: e4b78f2003 user: mistachkin tags: noSymlinks)
04:40
Rename and repurpose '--no-symlinks' into '--no-dir-symlinks', to prevent traversing into symlinked directories. Make the '--verily' option to 'clean' imply '--no-dir-symlinks'. ... (check-in: 66406ae942 user: mistachkin tags: noSymlinks)
02:42
The file_wd_isdir() function must honor the symlinks options. ... (check-in: de053c778c user: mistachkin tags: noSymlinks)
02:32
Attempt to always enforce the --no-symlinks option. ... (check-in: 35e37e9ba8 user: mistachkin tags: noSymlinks)
02:16
Add the --no-symlinks global command line option. ... (check-in: 85277aa3b3 user: mistachkin tags: noSymlinks)
2017-01-29
12:44
(cherry-pick): Changing the password requires a 'real' login. ... (check-in: fb4b87d95d user: jan.nijtmans tags: branch-1.37)
2017-01-28
19:48
Changing the password requires a 'real' login. ... (check-in: 8b562b90c0 user: mistachkin tags: trunk)
2017-01-27
12:30
(cherry-pick): Make "fossil version -v" work again with SQLite 3.15.x, since no-where is documented that "fossil now requires SQLite 3.16" Change VERSION to 1.37.1 (if ever released, this should at least be in it) ... (check-in: e79e454446 user: jan.nijtmans tags: branch-1.37)
12:28
(cherry-pick): The default MIME type for JSON wiki text should be 'text/x-fossil-wiki', not 'text/plain'. ... (check-in: 80d5408de1 user: jan.nijtmans tags: branch-1.37)
12:27
(cherry-pick): Update the "search" command to honor the -R option. ... (check-in: eab6be7b02 user: jan.nijtmans tags: branch-1.37)
12:26
(cherry-pick): Fix the --differ option on "fossil changes" which was broken in the 1.37 release. Openssl 1.0.2j -> 1.0.2k ... (check-in: 86db914551 user: jan.nijtmans tags: branch-1.37)
12:21
Make "fossil version -v" work again with SQLite 3.15.x, since no-where is documented that "fossil now requires SQLite 3.16" ... (check-in: 042d6a7b98 user: jan.nijtmans tags: trunk)
09:02
Merge trunk. Openssl 1.1.0c -> 1.1.0d ... (check-in: 767ae39cf4 user: jan.nijtmans tags: openssl-1.1)
08:57
Openssl 1.0.2j -> 1.0.2k. Whitespace. ... (check-in: 8cb5da6f27 user: jan.nijtmans tags: trunk)
2017-01-25
01:00
The default MIME type for JSON wiki text should be 'text/x-fossil-wiki', not 'text/plain'. ... (check-in: 58dd538355 user: mistachkin tags: trunk)
2017-01-19
13:46
Update the "search" command to honor the -R option. ... (check-in: 377fbf2ca7 user: drh tags: trunk)
2017-01-18
12:40
Fix the --differ option on "fossil changes" which was broken in the 1.37 release. ... (check-in: 3eec799992 user: drh tags: trunk)
11:19
Upgrade to openssl 1.1.0c. Merge trunk (up to fossil 1.37 release) ... (check-in: d0fbbd0115 user: jan.nijtmans tags: openssl-1.1)
2017-01-17
03:10
Updates to the Win32 version resource. ... (check-in: 8dc5d4fcd9 user: mistachkin tags: trunk)
02:22
Improved libfuse version information. ... (check-in: 28c7a35f2e user: drh tags: trunk)
02:16
More revisions to verbose version information reporting, especially for FUSE. ... (Closed-Leaf check-in: 444e3c4375 user: mistachkin tags: versionReform)
2017-01-16
23:34
Provide more information about compile-time options to the "fossil version -v" command. ... (check-in: 3192b13d20 user: drh tags: trunk)
23:16
Update the www/mkdownload.tcl script so that it generates a download page appropriate for version 1.37. ... (check-in: 66a6377ed2 user: drh tags: trunk)
20:58
Version 1.37 ... (check-in: 1669115ab9 user: drh tags: trunk, release, version-1.37)
20:35
The "fossil version -v" command and the /version?verbose webpage show the same output. Update the change log for the 1.37 release. ... (check-in: 9c97d23d36 user: drh tags: trunk)
09:05
Update the built-in Zlib to the 1.2.11 release ... (check-in: df91c2277f user: jan.nijtmans tags: trunk)
2017-01-11
16:36
Fix obsolete references to the legacy download page. Always refer to the new unversioned-content download page. ... (check-in: a1d7539214 user: drh tags: trunk)
2017-01-10
20:38
Schema enhancements necessary to support the Remark artifact. ... (Closed-Leaf check-in: f051f1d3d1 user: drh tags: remarks-on-checkins)
20:32
Improvements to comments and file format docs. ... (check-in: f0c19ea170 user: mistachkin tags: remarks-on-checkins)
19:09
Merge changes from trunk. ... (check-in: 43fa1ecc73 user: drh tags: remarks-on-checkins)
19:08
Expand the scope of the new Remark artifact so that it may be attached to either a check-in or a branch. ... (check-in: b78d1a67b7 user: drh tags: remarks-on-checkins)
13:05
Fix the report logic so that @-bindings in the SQL work the same as $- and :-bindings. ... (check-in: 241f1e2a4f user: drh tags: trunk)
05:30
Add the changes from check-in [3dddf7674b] to the 'makemake.tcl' tool, which is used to generate the Makefiles. ... (check-in: 913058306f user: mistachkin tags: trunk)
04:49
Fix dirent.h related compile errors when building for WINXP platform. ... (check-in: 3dddf7674b user: ashepilko tags: trunk)
2017-01-09
23:37
Since the db_database_slot() function is called during database error processing, it must use db_prepare_ignore_error() and then check the return code. ... (check-in: 02fa325a59 user: mistachkin tags: trunk)
2017-01-08
21:04
A couple more typo fixes in the file format document. ... (check-in: 290404ec37 user: mistachkin tags: remarks-on-checkins)
02:03
Small whitespace fix. ... (check-in: 7353be6873 user: mistachkin tags: remarks-on-checkins)
02:03
Fix a typo in the file format document. ... (check-in: 1c7438d478 user: mistachkin tags: remarks-on-checkins)
2017-01-07
19:29
Update the manifest parser so that it accepts remark artifacts. ... (check-in: e40143aaff user: drh tags: remarks-on-checkins)
19:10
Describe the Remark artifact used to record check-in remarks. ... (check-in: 0e9021f800 user: drh tags: remarks-on-checkins)
18:54
Clarification of the W card in the file-format document. ... (check-in: 5e9e76733a user: drh tags: trunk)
2017-01-06
17:01
Update the built-in SQLite to version 3.16.2. ... (check-in: ddfc7a608b user: drh tags: trunk)
15:28
Upgrade dirent.h to version 1.22. Minor spacing changes. ... (check-in: b66b99cde9 user: jan.nijtmans tags: trunk)
13:09
The "fossil all ui" command still does not work for repos that do not end in ".fossil", but it at least does not hyperlink them any more. ... (check-in: 805122df65 user: drh tags: trunk)
04:09
Fix user's email being swapped with name in git export committer record. ... (check-in: 76d9a4555b user: ashepilko tags: trunk)
2017-01-04
10:42
Restore executable flags, accidently changed in previous commit ... (check-in: 5972c3310f user: jan.nijtmans tags: trunk)
10:40
Add a web-page, where we can see the details on how SQLite was compiled (pragma compile_options), as sub-page for "stat". ... (check-in: eac405d7d6 user: jan.nijtmans tags: trunk)
09:34
Update the built-in SQLite to the 3.16.1 release ... (check-in: a8cd1e5427 user: jan.nijtmans tags: trunk)
2017-01-03
22:39
Simplify and cleanup various Fossil versioned setting files. ... (check-in: 724b1536a8 user: mistachkin tags: trunk)
10:53
Update the built-in Zlib to the 1.2.10 release. ... (check-in: ad8ad49de3 user: jan.nijtmans tags: trunk)
2017-01-02
19:11
Update the built-in SQLite to the 3.16.0 release. ... (check-in: 8b12786a1e user: drh tags: trunk)
2017-01-01
18:50
Upgrade zlib to version 1.2.9 ... (check-in: e38d5e1cbd user: jan.nijtmans tags: trunk)
2016-12-31
17:07
Fix a broken hyperlink on the homepage. ... (check-in: 0dc84fa224 user: drh tags: trunk)
2016-12-30
18:26
Update the built-in SQLite with minor fixes discovered during release testing. ... (check-in: 506dff5f7c user: drh tags: trunk)
00:15
Update the built-in SQLite to the 3.16.0 beta for testing. ... (check-in: 53430370a5 user: drh tags: trunk)
2016-12-28
18:20
Update test case now that merge rename bug has been fixed with checkin [0df5249d51]. ... (check-in: b09be7ba2f user: andybradford tags: trunk)
2016-12-26
14:00
Update the built-in SQLite to fix a potential (unreleased) corruption bug. ... (check-in: 88d581dc5e user: drh tags: trunk)
2016-12-24
21:58
Fix a harmless compiler warning. ... (check-in: 1eb509a807 user: drh tags: trunk)
21:55
Improved documentation of the "fossil sql" command. Add a note to the change log discussing recent enhancements to the "fossil sql" command. ... (check-in: a52f196740 user: drh tags: trunk)
19:38
Update the built-in SQLite to include the change that makes "main" an acceptable alias for the primary database, even if the primary database has been renamed to "repository" or "localdb". ... (check-in: 0d28198d03 user: drh tags: trunk)
18:19
Update the shell.c file from upstream (SQLite) so that the ".databases" command works with arbitrary-length filenames. ... (check-in: 277774b49e user: drh tags: trunk)
18:07
Improve the "fossil sql" command so that it opens all database - repository, localdb, and configdb. Use the latest command-line shell code from the SQLite project so that the ".tables" command correctly shows all tables. ... (check-in: 070815585a user: drh tags: trunk)
00:30
When a file has been deleted on the current branch and edited on a separate branch, bring in the edited version of the file when merging from the separate branch. ... (check-in: 0df5249d51 user: drh tags: trunk)
2016-12-23
23:42
When doing a gdiff between two versions, use the files being diffed as a basis for the temporary filenames that are constructed. ... (check-in: 051d0abaac user: drh tags: trunk)
23:25
Update the built-in SQLite to the latest 3.16.0 alpha for testing. ... (check-in: 20cffa1f89 user: drh tags: trunk)
2016-12-21
17:50
When calling gdiff (or stash gdiff) command between 2 versions, use the filename to prefix the temporary random filename so once inside the external diff program we know what file is being compared. (pending-review) ... (Closed-Leaf check-in: 856ca01b13 user: mgagnon tags: gdiff-tmpfilename-prefix)
2016-12-19
07:04
Enhance TH1 'redirect' command to support for HTTP redirects with a status code of 307. ... (check-in: bee6dbde54 user: mistachkin tags: trunk)
2016-12-15
22:46
First jab at creating a bash script for command completion ... (Closed-Leaf check-in: a4de0004b0 user: baruch tags: bash-completion)
2016-12-14
01:09
Fix the logic that combines merge risers (originally added to trunk by check-in [95d6ddc3]). Add test cases for this fix to graph-test-1.wiki. ... (check-in: 9ed134360b user: drh tags: trunk)
2016-12-08
20:10
Bring the change log up-to-date with the latest enhancements. ... (check-in: d1a6222ecd user: drh tags: trunk)
20:03
Update the built-in SQLite to the latest 3.16.0 alpha for testing. ... (check-in: 814dfd5a9c user: drh tags: trunk)
10:25
Fix warning when compiling with gcc on Windows (Microsoft's fprintf doesn't know %lld) ... (check-in: 68288686e0 user: jan.nijtmans tags: trunk)
2016-12-03
14:30
Still more documentation tweaks. ... (check-in: 6f3ec1bef6 user: drh tags: trunk)
13:19
Fix a link to the download page on the homepage. Fix a typo in the concepts.wiki documentation page. ... (check-in: 2b087b7dc3 user: drh tags: trunk)
2016-12-02
10:51
Fix executable flags, unintentionally changed in previous commit. ... (check-in: 2d9cba2a46 user: jan.nijtmans tags: trunk)
10:49
Get the "fossil all ui" command working on Cygwin where the global_config table has "repo:" entries containing the windows drive letter ... (check-in: eb9b2317d5 user: jan.nijtmans tags: trunk)
2016-12-01
21:56
Get the "fossil all ui" command working on windows systems where the global_config table has "repo:" entries that omit the drive letter. ... (check-in: 25758c7b1c user: drh tags: trunk)
16:41
Add support for the "fossil all ui" and "fossil all server" commands. ... (check-in: 239b4c1362 user: drh tags: trunk)
16:27
Fix the "fossil all ui" logic so that it still works for directory listings inside of chroot jails. ... (Closed-Leaf check-in: 226a0990d3 user: drh tags: all-ui)
15:40
A cleaner way of dealing with the --baseurl problem. ... (check-in: 8e4b8ba0e4 user: drh tags: all-ui)
14:56
Fix the "fossil all ui" command so that it works on Windows. But also comment out some very confused logic in process_on_web_page() that is associated with "--baseurl" option. This logic needs to be fixed prior to merging with trunk. ... (check-in: da1c769cd2 user: drh tags: all-ui)
04:32
Add the "fossil all ui" and "fossil all server" commands. ... (check-in: 98e9fd7352 user: drh tags: all-ui)
04:09
Add the test-database-names command. ... (check-in: 4636b4b370 user: drh tags: trunk)
2016-11-30
04:08
Minor correction to documentation of new /file webpage regarding multiple highlighted line blocks. ... (check-in: 4896c0b731 user: andybradford tags: trunk)
2016-11-29
16:57
Make the "Line Numbers" submenu element on the /artifact and /file pages a check-box. ... (check-in: 4946efef65 user: drh tags: trunk)
14:32
Further enhancements to the new /file webpage. ... (check-in: 3cca4c254f user: drh tags: trunk)
2016-11-28
16:44
New /file page that works like /artifact except takes a filename as an argument instead of a SHA1 hash of an artifact, and resolves to the most recent version of any file with that name. ... (check-in: d95f712f2c user: drh tags: trunk)
2016-11-26
01:26
Fix the "fossil all add" command so that it works even if repos that are already known are added. ... (check-in: b9da89a44e user: drh tags: trunk)
2016-11-22
22:26
Update the built-in SQLite to 3.16.0 alpha for testing. ... (check-in: 31ae6022aa user: drh tags: trunk)
22:23
Restore the -R option to the "fossil setting" command. ... (check-in: 5347e26326 user: drh tags: trunk)
21:50
Draft fix for 'settings' command issue when using the '-R' option. ... (Closed-Leaf check-in: 9807a05d8a user: mistachkin tags: settingRFix)
2016-11-19
20:11
minor simplification, and don't free zUuid if it was NULL ... (check-in: d6cb724e65 user: jan.nijtmans tags: trunk)
17:50
Avoid comparing a variable to NULL after the memory it is pointing to has been freed. This is harmless, as implemented, but it is technically undefined behavior in C. (This is a bug in the specification of the C language, imho.) ... (check-in: 4e126233ca user: drh tags: trunk)
2016-11-18
08:22
Remove some unnecessary spaces. ... (check-in: 467c4269b0 user: jan.nijtmans tags: trunk)
2016-11-16
19:29
Enable linenoise multiline editing so long commands and queries may be seen all at once therefore highlighted and copied from xterms ... (check-in: 03b6869856 user: andygoth tags: trunk)
19:25
Only #include "linenoise.h" in fshell.c on non-Windows platforms ... (check-in: 9c90682b02 user: andygoth tags: trunk)
14:47
Change the /test-version webpage into /version. Link it to /stat. ... (check-in: 286effd5e9 user: drh tags: trunk)
14:37
Fix a typo in the date of the 1.34 release on the download page. ... (check-in: 01d1f519cd user: drh tags: trunk)
2016-11-15
23:41
Allow uv delete (or del) as an alias for uv remove or uv rm. See [http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg24322.html]. ... (check-in: b59fa7d0e7 user: andygoth tags: trunk)
23:29
Fix revert -r option to mark a reverted file as edited if the reverted-to version does not exactly match the checkout version, even if the file size is equal ... (check-in: f9080683f0 user: andygoth tags: trunk)
23:23
Make changing to a symlink take priority over all other change types. This might also be a solution to the problem fixed by the previous commit, but it also avoids having a file that becomes a symlink (with target string length not equal to former file size) being marked as an ordinary edit. ... (check-in: f10a284abb user: andygoth tags: trunk)
23:11
Don't rely on vfile.islink to tell whether or not a file is currently a symlink for the purpose of avoiding calling file_contains_merge_marker(). It is possible for a file to have become a symlink since the last commit. If the link target's string length is not equal to the former file size, vfile_check_signature() will treat it as a normal change and not mark it as chnged==8 (SYMLINK), so execution can fall through to the undesirable call to file_contains_merge_marker(). ... (check-in: 43140feb1d user: andygoth tags: trunk)
22:49
Avoid listing added files when running "fossil changes -edited" ... (check-in: 0dea016de1 user: andygoth tags: trunk)
21:47
Change the /test-version webpage into a supported /version webpage. Add a link from /stat. ... (Closed-Leaf check-in: 57fea3151e user: drh tags: stat-update)
02:50
Add script to automate updating common command list in man page, and use it to update the man page ... (check-in: 42d6c86fa1 user: andygoth tags: trunk)
00:30
Fix timeline -n 0 to display an unlimited number of lines (rather than zero) to match documentation. Correct timeline -n for negative N documentation to match actual behavior. Limit compute_ancestors() and compute_descendants() on the assumption that there is no more than one entry per line. ... (check-in: def9af43a3 user: andygoth tags: trunk)
2016-11-12
22:58
Move the revert in test case to the correct sequence to avoid a merge conflict. ... (check-in: 3eeab4a589 user: andybradford tags: trunk)
22:19
Add test case to handle file add and rename before merging to trunk. Make test_setup return the repository path so it can be used in the test. ... (check-in: 6a5f0c5b55 user: andybradford tags: trunk)
04:21
Make artifact|whatis page use local time to match the timeline. Otherwise clicking on date/time links finds the wrong check-in in the timeline. May wish to convert other calls to datetime() to use local time. ... (check-in: e7192bb975 user: andygoth tags: trunk)
00:01
Fix uninitialized variable that was causing artifact download issues. ... (check-in: 3af5165a90 user: mistachkin tags: trunk)
2016-11-11
16:47
Add the ci=BRANCH and filename=NAME query parameters to the /raw page. ... (check-in: fc29b08125 user: drh tags: trunk)
2016-11-10
19:44
Fix typo in help text for fossil tag ... (check-in: 405a93e4dc user: andygoth tags: trunk)
2016-11-09
03:02
Minor tweak to changes help text: move some trivia to the end so the more important material is read first ... (check-in: 5c8bdd00c2 user: andygoth tags: trunk)
01:44
Minor tweak to branch help text ... (check-in: 596f29fa1b user: andygoth tags: trunk)