Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
145 check-ins using file src/json_status.c version c5fdb35c64
|
2013-08-26
| ||
| 08:40 | Report syntax errors in T-cards for events when they happen, not when the complete manifest is parsed already. ... (check-in: 512cc1977a user: jan.nijtmans tags: trunk) | |
| 08:16 | Add a comment why the R-card is necessary in the initial empty check-in manifest. ... (check-in: 4bf2708294 user: jan.nijtmans tags: trunk) | |
| 07:56 | Document that the C-card in events is optional. Proof: [/event/bfdf42305400f6ca]. Don't output C-card in events when not necessary (code copied from attach.c) ... (check-in: 6a03e9329b user: jan.nijtmans tags: trunk) | |
|
2013-08-25
| ||
| 14:53 | Added average event count per active time period to the /reports views. ... (check-in: 16f033dda3 user: stephan tags: trunk) | |
| 03:25 | Move some posix only includes so they are not used on _WIN32. Can compile again on MinGW. ... (check-in: 8278a03f0e user: mgagnon tags: ssh-test-http) | |
| 02:11 | Spiders and robots are presented with a captcha if they request the annotation page. ... (check-in: f8a2aa0ce7 user: drh tags: trunk) | |
|
2013-08-24
| ||
| 22:33 | Report all available CGI environment variables on the test_env page. ... (check-in: f9c2dec2ec user: drh tags: trunk) | |
| 22:22 | For the control summary, make sure that the reported tags are sorted by UUID. This way, [fb5b161492] looks much better (after "fossil rebuild") ... (check-in: 5b1a6850ac user: jan.nijtmans tags: trunk) | |
| 20:44 | check-in->manifest and tag->control, that are the names of the artifact types used everywhere else. ... (check-in: a5479f189b user: jan.nijtmans tags: trunk) | |
| 19:02 | Make a best effort to record the IP of the remote host in rcvfrom. ... (check-in: 5627d795c3 user: andybradford tags: ssh-test-http) | |
| 16:11 | Add the --parse option to test-integrity which causes artifacts to be run through the manifest parser. ... (check-in: 2e83d0dea3 user: drh tags: trunk) | |
|
2013-08-23
| ||
| 21:40 | remove incorrect remark. ... (check-in: 45843c8e95 user: jan.nijtmans tags: trunk) | |
| 21:00 | Print a warning during "fossil rebuild" for each Manifest which has F-cards but no R-card. This violates the documentation! Addendum: Documentation is corrected now: Originally the R-card was required but due to compaints that changed. ... (Closed-Leaf check-in: 2549a3a51b user: jan.nijtmans tags: lack-R) | |
| 20:58 | Improved rendering of ascii-art hexadecimal for the captcha. ... (check-in: d394010047 user: drh tags: trunk) | |
| 16:02 | Set id attribute on <select> element generated by TH1 combobox command to NAME so it can be referenced by a <label> element. ... (check-in: 73fdb8a73d user: joel tags: trunk) | |
| 14:14 | Remove unused sshin_read() function that was missed. ... (check-in: f64c003d13 user: andybradford tags: ssh-test-http) | |
| 13:25 | Control files containing self-referencial T-cards can be valid Manifests, but some are mis-catogorized as (invalid) Control artifacts if they don't contain F- or R- cards (which is allowed, according to the documentation). Example: [2a4e4cf03e]. A "fossil rebuild" is needed to see the effect of this change. ... (check-in: b2a5320737 user: jan.nijtmans tags: trunk) | |
| 13:15 | Report "E-card in ???" syntax errors as "?-card in event". Refactoring needed for next commit. No change in functionality. ... (check-in: 6324a3ce6b user: jan.nijtmans tags: trunk) | |
| 10:07 | typo's ... (check-in: 882f7a5dad user: jan.nijtmans tags: trunk) | |
| 09:54 | According to the documentation [/artifact/9974dfbc5c?txt=1&ln=178-179], the first manifest in the project has no P-card. Make it so, as a P-card with no arguments is just ignored and serves no purpose. (I tested this in a new repo, and it works just fine) ... (check-in: 989c99351e user: jan.nijtmans tags: trunk) | |
| 09:27 | When doing a "fossil commit --dry-run", don't store the text "Dry-run mode - no comment provided." as template for the next commit comment. ... (check-in: dfd8962ff2 user: jan.nijtmans tags: trunk) | |
|
2013-08-22
| ||
| 20:28 | Only change the mouse cursor over node boxes in the timeline. ... (check-in: 52bf905935 user: joel tags: trunk) | |
| 18:44 | In stead of "A-card on tag" syntax error, report "T-card in attachment". Various other inconsitancies in syntax error messages. This is only refactoring, no change in functionality. ... (check-in: bcaba112cb user: jan.nijtmans tags: trunk) | |
| 18:22 | Speedup of "fossil rebuild" by not calculating the Z checksum unnecessary. Doing a "fossil rebuild" on the Tcl fossil repository, this saves about 1 second (out of 1m22) on my machine. OK, OK, not THAT impressive, but it's a measurable gain with 0 cost. ... (check-in: 960fb04e35 user: jan.nijtmans tags: trunk) | |
| 03:20 | Update to the latest SQLite 3.8.0 beta for testing. ... (check-in: 3c5f1f08d8 user: drh tags: trunk) | |
| 03:04 | Tcl script code style fix. ... (check-in: 41dbd44b12 user: mistachkin tags: trunk) | |
|
2013-08-21
| ||
| 14:24 | The undocumented feature of resolving RID-looking strings as RIDs has been changed to rid:### instead to avoid surprise, per ML discussion. ... (check-in: 4c80aa2ae1 user: stephan tags: trunk) | |
| 12:58 | Fix some errors/inconsistancies in SYNTAX error messages ... (check-in: ccc7724a51 user: jan.nijtmans tags: trunk) | |
| 07:45 | Cluster artifacts with Q-card are invalid. Check for "cluster" artifacts first so all later code-paths can leave out the M-card check. Check for K-cards in the "ticket" section, so all later code-paths can leave out this check. Check for L-cards in the "wiki" section, so all later code-paths can leave out this check. This saves 9 code-lines while keeping equal functionality (except for the additional Q-card check in Clusters) ... (check-in: 13e2c73aec user: jan.nijtmans tags: trunk) | |
| 07:09 | On Cygwin $tcl_platform(platform) is "unix", but we want the same font as on win32 if the "win32" mode is used. ... (check-in: 09c2cf3e58 user: jan.nijtmans tags: trunk) | |
| 02:26 | Tk diff: Just stick with default fonts (with an exception for Windows). ... (check-in: 7e9c7c0454 user: joel tags: trunk) | |
|
2013-08-20
| ||
| 14:07 | Added a link to the pgp-signed note. Not happy with how it turns out, but it is proof-of-concept. Edit: closing after ML comments pointed out the ability of this feature to be abused by adding look-alike code to the commit message. ... (Closed-Leaf check-in: 884a765abd user: stephan tags: timeline-pgp-marker) | |
| 12:57 | experimentally added "PGP SIGNED" marker to PGP-signed commits in the timeline, per ML request. ... (check-in: d632a50e2a user: stephan tags: timeline-pgp-marker) | |
| 11:29 | Detect properly that [ff59f202fe] is an invalid Control artifact. ... (check-in: 13161f39aa user: jan.nijtmans tags: trunk) | |
| 08:08 | Eliminate some unnecessary variables. Eliminate some (harmless) compiler warnings with gcc 4.8.1. Remove some spaces at the end of lines. No functional changes. ... (check-in: 4e092e0f15 user: jan.nijtmans tags: trunk) | |
| 04:06 | Bring in the latest SQLite with VDBE and Btree performance optimizations. ... (check-in: 187845b574 user: drh tags: trunk) | |
|
2013-08-19
| ||
| 18:33 | Minor addenda to the R-card calculation notes. ... (check-in: 9d50b77e12 user: stephan tags: trunk) | |
| 17:13 | Set default CSS for canvas node colors since Chrome has different browser defaults than all others. ... (check-in: 9b19e7e086 user: drh tags: trunk) | |
| 14:48 | We can detect when to enable compatibility mode, so do this instead of requiring an explicit argument. ... (check-in: 90c4859315 user: andybradford tags: ssh-test-http) | |
| 14:30 | Don't use a separate Control artifact for "merge --integrate" any more ... (check-in: daa8eb95e4 user: jan.nijtmans tags: trunk) | |
| 14:28 | Don't use a separate Control artifact for "merge --integrate" any more. ... (Closed-Leaf check-in: eb8787a326 user: jan.nijtmans tags: merge-integrate) | |
| 13:21 | Use C-card in stead of T-card to put comment on timeline for "merge --integrate" Control artifact. Demo: [4d27a34ae936f30c] ... (check-in: 12c30d33d4 user: jan.nijtmans tags: trunk) | |
| 13:19 | Use C-card in stead of T-card to put comment on timeline for "merge --integrate" Control artifact. ... (Closed-Leaf check-in: 908a090c88 user: jan.nijtmans tags: merge-integrate) | |
| 11:29 | Better enforcement of lexicographical ordering of T cards. ... (check-in: 2979c08271 user: drh tags: trunk) | |
| 11:22 | Update to the latest SQLite 3.8.0 beta in order to test SQLite. ... (check-in: 48445291c0 user: drh tags: trunk) | |
|
2013-08-18
| ||
| 08:11 | No longer reject valid Control artifacts like this one: [ce319b7898] ... (check-in: 55cacfcace user: jan.nijtmans tags: trunk) | |
| 04:22 | Add CSS class to anchor for open leaves for consistency. ... (Closed-Leaf check-in: 8ad0a8796a user: andybradford tags: pending-review) | |
| 01:26 | Use a little more precaution that the Fossil command has been seen first. ... (check-in: 12dbaebec2 user: andybradford tags: ssh-test-http) | |
|
2013-08-17
| ||
| 23:05 | Change SSH transport to use a single SSH connection if client/server willing. Add client header so server can detect when to use new mode. Also improve backwards compatibility for older SSH clients by responding to probes. ... (check-in: f0bb3c9b5a user: andybradford tags: ssh-test-http) | |
| 19:38 | Resolved ticket [05f4bbc266]. ... (check-in: 635598ed93 user: stephan tags: trunk) | |
| 12:35 | Added AUX_SCHEMA version to (version -verbose), mainly to give the libfossil configure script a way to fetch this value without poking around the db. ... (check-in: 08429eb7b2 user: stephan tags: trunk) | |
|
2013-08-16
| ||
| 14:36 | update documentation ... (Closed-Leaf check-in: d10eee3a4b user: jan.nijtmans tags: merge-integrate) | |
| 13:45 | Allow multiple T-cards with the same tags, provided they are for different uuid's which are in strict increasing order. ... (check-in: f2ae58e393 user: jan.nijtmans tags: merge-integrate) | |
| 12:44 | If the "+closed" value is an UUID, interpret this as an "fossil merge --integrate" where the uuid is the destination branch of the integration. ... (Closed-Leaf check-in: 4377917005 user: jan.nijtmans tags: merge-integrate) | |
| 10:07 | If a Control artifact contains a C-card, don't ignore it any more but display it in the timeline. Demo: [deb18ab6e3cdde20]. A "fossil rebuild" is needed to make this visible. ... (check-in: 9aca5f7930 user: jan.nijtmans tags: trunk) | |
| 09:14 | Added a minor clarification regarding fossilization of strings to the R card demo. ... (check-in: 76d901ddb9 user: stephan tags: trunk) | |
| 08:17 | Fix display of timeline graph in IE8, broken by commit [e412f97999] ... (check-in: 5885241f52 user: jan.nijtmans tags: trunk) | |
| 07:28 | Fix display of timeline graph in IE8, broken by commit [e412f97999] ... (Closed-Leaf check-in: ef5e74961a user: jan.nijtmans tags: fix-ie8) | |
| 03:25 | Merge in all new development from trunk. ... (check-in: 535cba9158 user: andybradford tags: ssh-test-http) | |
| 00:47 | Use two arguments to getComputedStyle() for compatibility with very old versions of Firefox. Allow setting graph node background colors using "#canvas{ background-color: COLOR; }". ... (check-in: c06e296b40 user: drh tags: trunk) | |
|
2013-08-15
| ||
| 22:45 | Update the built-in SQLite to the latest 3.8.0 beta with the ORDER BY and GROUP BY name resolution fixes, in order to test SQLite. ... (check-in: b67b42fea8 user: drh tags: trunk) | |
| 20:22 | Make formatting of the syntax for the various cards consistent, including in the summary table. ... (check-in: 4e9522abaf user: mistachkin tags: trunk) | |
| 15:54 | Merged in [499481a72ab], thereby testing that change. No worries, autosync if off. ... (check-in: 6cf83a0101 user: stephan tags: trunk) | |
| 15:49 | the +closed tag added by merge --integrate now added a value/comment to that effect on the closing tag. ... (Closed-Leaf check-in: 499481a72a user: stephan tags: merge-integrate-tag) | |
| 15:46 | minor tweaks to the file format summary table. ... (check-in: f9bda0a296 user: stephan tags: trunk) | |
| 13:37 | merged in [b1dd871c8e] from mgagnon. ... (check-in: 70a3f4ad21 user: stephan tags: trunk) | |
| 13:13 | Merge from trunk. ... (check-in: 0ff5fe7638 user: dg tags: dg-misc) | |
| 12:37 | unused variable ... (check-in: dbf71f8289 user: jan.nijtmans tags: trunk) | |
| 12:14 | Add details about the URL argument on the clone command help text and refer to the clone command usage on other commands that have a URL argument. (sync, push, pull, remote-url) Pending review. ... (Closed-Leaf check-in: b1dd871c8e user: mgagnon tags: clone_help_text_improvement) | |
| 05:29 | Fix documentation typo. ... (check-in: 14a378fd0b user: mistachkin tags: trunk) | |
| 03:43 | Fix the CGI so that it works again with Apache. ... (check-in: d01b3c953f user: drh tags: trunk) | |
| 02:59 | Rig the timeline graph so that CSS of the form: "#canvas{color:#000;}" will set the color of the graph lines and boxes. ... (check-in: e412f97999 user: drh tags: trunk) | |
| 00:37 | minor typo fix. ... (check-in: 80bf17c0d0 user: stephan tags: trunk) | |
| 00:37 | Reworked the manifest summary table to indicate how many of each card type are required. ... (check-in: 559047a042 user: stephan tags: trunk) | |
| 00:33 | minor typo fix. ... (check-in: 88e94ebee7 user: stephan tags: trunk) | |
|
2013-08-14
| ||
| 14:32 | Add missing anchors in the server.wiki page. ... (check-in: 4b05c2c59f user: drh tags: trunk) | |
| 14:30 | Added the Hacker How-To page with a link on the home page. Other documentation enhancements and typo fixes. ... (check-in: 04af93e619 user: drh tags: trunk) | |
|
2013-08-13
| ||
| 23:05 | Further improvements to server documentation. No code changes. ... (check-in: b91754ab85 user: drh tags: trunk) | |
| 19:57 | Fixed a typo in error text which never triggers. Manifest crosslinking's update of the event table now shows the tag value for a +closed/-closed tag if it is available (the default client does not currently add a value for those but the prototype one can). ... (check-in: 902135f747 user: stephan tags: trunk) | |
| 18:53 | Updated server documentation to discuss SCGI. ... (check-in: ce0594c22d user: drh tags: trunk) | |
| 18:15 | Add support for SCGI via the --scgi command-line option to the "server" and "ui" and "http" commands. ... (check-in: a2e7472d0f user: drh tags: trunk) | |
| 13:37 | c/the the/the/ ... (check-in: 0b75e2e615 user: jan.nijtmans tags: trunk) | |
| 12:51 | Abandoned changes: Split the various server implementations out of "main.c" and into a new source file "server.c". This is groundwork for adding SCGI and FastCGI. ... (Closed-Leaf check-in: bc20a30f49 user: drh tags: scgi) | |
| 12:50 | fixed a misspelled closing tag :/. ... (check-in: df60acb691 user: stephan tags: trunk) | |
| 12:47 | Added missing name anchor and section number. Minor text improvements. ... (check-in: 04764ae2ea user: stephan tags: trunk) | |
| 12:39 | Added an "Addenda" section as a place for describing the file format algorithms in more detail (hints for implementors). ... (check-in: 1b5513cba3 user: stephan tags: trunk) | |
| 09:14 | commit not longer requires a comment (it uses a placeholder) when in dry-run mode, per ML request. ... (check-in: 75e042503b user: stephan tags: trunk) | |
| 02:23 | Move table.sbsdiffcols width attribute to CSS ... (check-in: 4aaf5dc5ec user: joel tags: trunk) | |
|
2013-08-12
| ||
| 12:50 | Javascript-enabled hyperlinks now initially point to a honeypot, rather than to nothing. ... (check-in: 2d14b6c4dc user: drh tags: trunk) | |
| 12:37 | New g.isHuman global variable is set if we believe an HTTP request is coming a real human being, rather than a spider or bot. ... (check-in: e065d5b7f1 user: drh tags: trunk) | |
| 06:43 | Simplify command line interaction: remove settings from global and provide one less command line option. Altering settings in open fossils can be done with sync -l or cleared with remote-url if necessary. ... (check-in: ed20da7499 user: andybradford tags: ssh-test-http) | |
|
2013-08-11
| ||
| 16:17 | Changed status of J card from (R?) to (R). ... (check-in: b86fb096c6 user: stephan tags: trunk) | |
| 13:55 | Fixed the required designation on the U card in Manifests. ... (check-in: bc601702c1 user: stephan tags: trunk) | |
| 13:53 | Expanded the control artifact/card summary table to distinguish between optional and required cards. ... (check-in: e946977e0e user: stephan tags: trunk) | |
| 13:52 | Removed a duplicated assert(). ... (check-in: 30f44eb2e4 user: stephan tags: trunk) | |
|
2013-08-10
| ||
| 23:02 | Clean up handling of global variable to avoid accidental setting of database. Only alter database options if URL is SSH. ... (check-in: 0c19424325 user: andybradford tags: ssh-test-http) | |
| 21:31 | Make it possible to override global setting from command line. Improve sync output when test-http is in use. ... (check-in: 3c479fb95b user: andybradford tags: ssh-test-http) | |
|
2013-08-09
| ||
| 18:35 | Removed an unused struct member contentCache::skipCnt. ... (check-in: 65f49c99d0 user: stephan tags: trunk) | |
| 07:56 | Correct typo that resulted in space being on the wrong side of the word. ... (check-in: 738b505362 user: andybradford tags: ssh-test-http) | |
| 07:49 | Fix logic so ignoring login requirement only affects ssh:// URLs. ... (check-in: 9284bfb157 user: andybradford tags: ssh-test-http) | |
| 07:29 | Reimplement the default test-http behavior while retaining the ability to use http to take advantage of Fossil capabilities with SSH URLs. ... (check-in: 7c9347f9c7 user: andybradford tags: ssh-test-http) | |
| 07:23 | Avoid zombies on client side by waiting for children. This can happen when there are a large number of changes to transmit. ... (Closed-Leaf check-in: 308f52a63a user: andybradford tags: ssh-shared-account) | |
| 04:38 | Get capabilities fix et al. ... (check-in: ebafd0c335 user: andybradford tags: ssh-shared-account) | |
| 01:09 | Fix incorrect wrapping of brief finfo output by simply reducing the size of the buffer passed to comment_print(). ... (Closed-Leaf check-in: bdbf144ed3 user: andybradford tags: pending-review) | |
|
2013-08-08
| ||
| 21:32 | merge trunk. Adapt patch to latest SQLite changes (the MAX_PATH fix in os_win.c) ... (Closed-Leaf check-in: 13594a125a user: jan.nijtmans tags: possible-cygwin-fix) | |
| 18:57 | Merge with trunk. ... (Closed-Leaf check-in: 9a023e0d6c user: isaac.jurado tags: git-better-import) | |
| 14:00 | Merge the fork in trunk. ... (check-in: 0e822db7f1 user: drh tags: trunk) | |
| 08:42 | Fixed /reports menu buttons broken by renaming of the link. Removed a target=... from one of the /reports hrefs, for consistency. ... (check-in: 00630581c4 user: stephan tags: trunk) | |
|
2013-08-06
| ||
| 14:33 | When resetting capabilities, make sure that "anonymous" and "nobody" can be reapplied afterwards. ... (check-in: b1ffbfa4bc user: drh tags: trunk) | |
| 08:11 | Update the built-in SQLite to the latest 3.8.0 beta from upstream. ... (check-in: 2360b17d73 user: drh tags: trunk) | |
| 08:01 | Add in a missing line from the Unshun x-site fix of [cc9b04baaf]. (Previously checked into the wrong branch.) ... (check-in: 6ddbe2dfd8 user: drh tags: trunk) | |
| 08:00 | Add in a missing line from the Unshun x-site fix of [cc9b04baaf]. ... (check-in: 1b5f9ac250 user: drh tags: ssh-shared-account) | |
| 04:03 | Changed prompt to remove ambiguity between SSH user vs Fossil user. ... (check-in: f592b80a17 user: andybradford tags: ssh-shared-account) | |
|
2013-08-05
| ||
| 17:39 | Merge recent addtional features (integrate, reports, timeline, et al.) from trunk. ... (check-in: a5df66f3aa user: andybradford tags: ssh-shared-account) | |
| 13:04 | Install the latest SQLite 3.8.0 beta from upstream. Fossil does not use any of the new features. This commit is for the purpose of testing SQLite. ... (check-in: 605db92957 user: drh tags: trunk) | |
| 12:05 | Change the "Unshun" links to jump to a prefilled form for duing the unshun, rather than doing the unshun directly. ... (check-in: cc9b04baaf user: drh tags: trunk) | |
|
2013-08-04
| ||
| 07:54 | Renamed /stats_report to /reports. ... (check-in: 3bb44041f0 user: stephan tags: trunk) | |
| 06:06 | Change cgi_accept_forwarded_for() to return the accepted IP address from the X-Forwarded-For header, which could contain multiple addresses (e.g. if the client is also behind a proxy). The last one is the only one we can currently trust. ... (check-in: 59f790bc52 user: joel tags: trunk) | |
|
2013-08-03
| ||
| 23:33 | Previous two check-ins do not work correctly for CGI. Trying once again. ... (check-in: d8f716e1d1 user: drh tags: trunk) | |
| 23:27 | Fix an initialization error in the HTTP request header gathering logic. ... (check-in: 8c4158e40c user: drh tags: trunk) | |
| 23:19 | Enhance the test_env webpage so that it shows the original HTTP header text in showall=1 mode. ... (check-in: 03f07b5a66 user: drh tags: trunk) | |
| 22:42 | Accept the X-Forwarded-For HTTP header argument if input is coming from a socket with a remote address of "127.0.0.1". ... (check-in: 29b558a1c1 user: drh tags: trunk) | |
| 17:11 | Added missing U card from the initial description of Control Artifact requirements. ... (check-in: cac2d69546 user: stephan tags: trunk) | |
| 16:22 | Added ?#-n|--limit #? option to (fossil tag find). ... (check-in: 73135ec22a user: stephan tags: trunk) | |
|
2013-08-02
| ||
| 18:57 | Change the undocumented --heavy option of sync/push/pull to "--verily". ... (check-in: f25bdf6e84 user: drh tags: trunk) | |
| 18:53 | Add the undocumented --heavy option to the sync, push, and pull commands. The --heavy option causes all known artifacts to be reported using "igot" cards and can be used to overcome a sync-stall. ... (check-in: 05ba15e448 user: drh tags: trunk) | |
| 16:26 | Add "timelineCurrent" class to indicate the current checkout version when viewing the timeline page locally. (Feel free to change the default style.) ... (check-in: 81f9791c01 user: joel tags: trunk) | |
| 09:42 | merge trunk ... (check-in: 863068e0f0 user: jan.nijtmans tags: possible-cygwin-fix) | |
| 09:14 | Output "manifest" file before content_put(). I don't think it really makes a difference, but the original code did it in this order. ... (check-in: 8c5b5c3820 user: jan.nijtmans tags: trunk) | |
| 08:58 | Bug-fix, discovered by Stephan Beal and Andy Bradford, in handling the --integrate tag on a fork merge: the "closed" tag should not be added in this case. ... (check-in: 9eb3f5f605 user: jan.nijtmans tags: trunk) | |
|
2013-08-01
| ||
| 21:30 | Removed an extraneous "utc" from a datetime() call in /json/timeline. ... (check-in: 340da668ae user: stephan tags: trunk) | |
| 21:00 | minor changelog addition. ... (check-in: 9c4f91d85d user: stephan tags: trunk) | |
| 20:56 | Merged in Jiri's /wiki page link addition. And trying out merge --integrate. ... (check-in: 366f1ae6da user: stephan tags: trunk) | |
| 13:28 | merge trunk. Upgrade to latest SQLite, with experimental Cygwin fixes. ... (check-in: 7f6019efcf user: jan.nijtmans tags: possible-cygwin-fix) | |
| 10:18 | Added /reports as alias for /stats_report, will remove /stats_report soon. Updated changes.wiki. ... (check-in: 34fc301f36 user: stephan tags: trunk) | |
| 08:25 | Make new "merge --integrate" respect the (undocumented) --date-override and --user-override options. Revert accidental commit of win/Makefile.mingw ... (check-in: 55efbcbcf6 user: jan.nijtmans tags: trunk) | |
| 07:51 | New --integrate option to "fossil [/help?cmd=merge|merge]", which automatically closes the merged branch when committing. ... (check-in: 69dd259eb2 user: jan.nijtmans tags: trunk) | |
|
2013-07-26
| ||
| 08:17 | rebase ... (Closed-Leaf check-in: 2015bbd55d user: jan.nijtmans tags: merge-integrate) | |
|
2013-07-24
| ||
| 05:24 | rebase ... (check-in: 072e2b16db user: jan.nijtmans tags: merge-integrate) | |
|
2013-07-22
| ||
| 09:23 | rebase ... (check-in: 7b7a4bd579 user: jan.nijtmans tags: merge-integrate) | |
| 07:52 | Fix bug. ... (check-in: c9ee3ff674 user: jan.nijtmans tags: merge-integrate) | |
| 07:42 | A few more places where the "chnged" field values 4 and 5 have effect ... (check-in: 530ef9557b user: jan.nijtmans tags: merge-integrate) | |
| 07:09 | Add "fossil status" markers for UPDATED_BY_INTEGRATE and ADDED_BY_INTEGRATE ... (check-in: e9ffc05c0b user: jan.nijtmans tags: merge-integrate) | |
|
2013-07-14
| ||
| 15:52 | Documentation ... (check-in: d1865e7ca1 user: jan.nijtmans tags: merge-integrate) | |
| 14:56 | Rebase. Use -4 as INTEGRATE tag, not -3 ... (check-in: 967ef5f7c5 user: jan.nijtmans tags: merge-integrate) | |