Fossil

Timeline
Login

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

158 check-ins using file src/branch.c version a1848d70d8

2014-09-10
08:17
merge trunk check-in: d5a00a1521 user: jan.nijtmans tags: multi-thread
07:33
Update and extend verbiage for the 'th1-docs' setting. Closed-Leaf check-in: 42c9718f93 user: mistachkin tags: dynamicTh1Docs
01:39
Fix a typo in help text. check-in: fe46cc6532 user: drh tags: trunk
2014-09-09
21:25
Merge updates from trunk. check-in: fdfe5e66f1 user: mistachkin tags: dynamicTh1Docs
21:24
Omit TH1 hooks setting when it is not enabled. check-in: ff8ac8db0a user: mistachkin tags: trunk
21:22
Add compile-time option to control whether the TH1 embedded documentation support is enabled. Also, omit TH1 hooks setting when it is not enabled. check-in: 516cc0c91f user: mistachkin tags: dynamicTh1Docs
20:27
Merge updates from trunk. check-in: 90c0f4f7ee user: mistachkin tags: dynamicTh1Docs
20:24
Some incremental build enhancements for MinGW. check-in: 5fc4366ca6 user: mistachkin tags: trunk
20:01
When TH1 'transfer hooks' are enabled, provide the list of UUIDs received by the server to the script. check-in: fc32fae7bc user: mistachkin tags: trunk
19:45
Add 'reinitialize' command to TH1. Add 'flags' to the globalState TH1 command. check-in: 3355835fdc user: mistachkin tags: trunk
19:43
More proposed fixes to the issues pointed out by Edward Berner. check-in: 7807ec4e13 user: mistachkin tags: trunk
12:43
Fix incremental builds using mingw on Windows Closed-Leaf check-in: e1fa9e8889 user: baruch tags: better-mingw
07:44
Make server on Windows aware of current checkout if run interavtivly from open checkout. Allows using special names prev/next/current in ui Closed-Leaf check-in: aead49f36a user: baruch tags: baruch-winserver
07:04
Option to shun/unshun a whole transaction (by rcvid) Closed-Leaf check-in: 66b5647af7 user: baruch tags: baruch-multishun
07:00
Merge in the TH1 reinitialize command, from its branch, for testing purposes. check-in: 76ea9ee63d user: mistachkin tags: dynamicTh1Docs
06:54
Allow shunning/unshunning multiple files at a time check-in: 9f6b1964fb user: baruch tags: baruch-multishun
2014-09-08
18:46
Another warning fix. Closed-Leaf check-in: 865b8e964f user: mistachkin tags: warningFixes
18:23
Improve page title handling. check-in: 67d5812c7f user: mistachkin tags: dynamicTh1Docs
18:13
Add 'th1-docs' setting to control whether or not TH1 scripts are allowed in embedded documentation files. check-in: 4f0b0a6af2 user: mistachkin tags: dynamicTh1Docs
16:46
Add 'reinitialize' command to TH1. Add 'flags' to the globalState TH1 command. Closed-Leaf check-in: f3a7da44df user: mistachkin tags: th1ReInit
08:08
Highly experimental changes to enable TH1 usage in embedded docs. Do not merge. check-in: 5ce57f21bd user: mistachkin tags: dynamicTh1Docs
2014-09-07
19:50
More proposed fixes to the issues pointed out by Edward Berner. check-in: 4429a4c3cc user: mistachkin tags: warningFixes
09:49
removed a duplicated if() block, moved a free()-after-return, both reported by Edward Berner. check-in: 3fc62dde2c user: stephan tags: trunk
08:52
When using $EDITOR to enter a commit message, tags provided via the --tag flag are now listed, per ML request. check-in: ae00c63109 user: stephan tags: trunk
03:41
Fix a c99-ism (non-constant initializer). check-in: 128f606fda user: edward tags: trunk
00:41
When TH1 'transfer hooks' are enabled, provide the list of UUIDs received by the server to the script. Closed-Leaf check-in: acb61e5ee9 user: mistachkin tags: xferUuidList
2014-09-05
06:23
Minor enhancements to the Tcl integration subsystem. check-in: 946c3eb640 user: mistachkin tags: trunk
06:12
Style cleanup for return code to name mappings. check-in: 2212ac40a8 user: mistachkin tags: trunk
06:06
By default on MinGW, do not include the 'openssl' target when building as this causes OpenSSL to be needlessly rebuilt (can be overridden via FOSSIL_BUILD_SSL=1). check-in: 06e5595a06 user: mistachkin tags: trunk
2014-09-04
11:43
Make "ls" an alias for every "list" subcommand. check-in: 68c11dbafa user: drh tags: trunk
09:22
Merge trunk. Implement new "max-worker-threads" setting, which controls the maximum number of auxilary worker threads that a single prepared statement may start. check-in: 3a9f3a73c2 user: jan.nijtmans tags: multi-thread
2014-09-03
20:25
I have "ls"-ified "list" subcommands for my personal use-case before -- roll through code and convert others for sake of consistency Closed-Leaf check-in: ce6de743c2 user: bch tags: ls
18:02
Refine the batch file used to build with MSVC to permit use of a pre-existing build environment. check-in: 214b1d0a37 user: mistachkin tags: trunk
11:37
If we really want to do fast sorting in separate threads, SQLITE_DEFAULT_WORKER_THREADS should be set to >0. check-in: 8b21690899 user: jan.nijtmans tags: multi-thread
08:10
merge trunk check-in: 62446e2c64 user: jan.nijtmans tags: multi-thread
08:09
If fossil is configured with --disable-internal-sqlite and the system SQLite is SQLite 3.8.7 (not compiled with SQLITE_THREADSAFE=0), allow fossil to use the faster sorting using multiple threads. check-in: d4044fe220 user: jan.nijtmans tags: trunk
00:03
Cleanup some spacing and the call to makeheaders in the main.mk and MinGW makefiles. check-in: 9f0686c314 user: mistachkin tags: trunk
00:00
Cleanup some spacing and the call to makeheaders in the main.mk and MinGW makefiles. Closed-Leaf check-in: 8b0dfbb6a3 user: mistachkin tags: makefileCleanup
2014-09-01
20:40
Add thread support to fossil, so SQLite can use additional threads for sorting (experimental) check-in: bc8b21d01c user: jan.nijtmans tags: multi-thread
19:01
Add two new quotes to the "quotes.wiki" page. check-in: c19b3f8846 user: drh tags: trunk
18:51
Add the --with-miniz configuration option (with the complete miniz source code.) Add the globalState TH1 command and fixes to the TH1 expr command. check-in: 66ae70a54b user: drh tags: trunk
18:42
Incorporation the latest SQLite 3.8.7 alpha from upstream, for testing. check-in: fc8d8546ff user: drh tags: trunk
2014-08-31
08:42
Cherry-pick [http://www.sqlite.org/src/info/f61db04be4d7fb21b7f721647c37c45e283ffbea|f61db04be4]: In the command-line shell, added options --lookaside, --pagecache, and --scratch used to configure auxiliary memories (except from the change from SQLITE_CONFIG_SINGLETHREAD -> SQLITE_CONFIG_MULTITHREAD, because fossil doesn't use multiple threads) check-in: 75dcdd0bdb user: jan.nijtmans tags: trunk
2014-08-30
09:03
Cherry-pick [http://www.sqlite.org/src/info/11a70e1ae7f05d06e4e09c9d20db0444b8881584|11a70e1ae7]: Refactor the names of state objects in the command-line shell implementation check-in: e4bc6f12ea user: jan.nijtmans tags: trunk
2014-08-29
02:36
Minor correction to the change log entry describing Tcl integration. check-in: bb5fa49274 user: mistachkin tags: trunk
02:32
Update the change log. Closed-Leaf check-in: 7e955147a1 user: mistachkin tags: optionalMiniz
02:29
Update the change log. Closed-Leaf check-in: 57b1290be3 user: mistachkin tags: th1ExprFix
02:28
Add globalState TH1 command to the change log. Closed-Leaf check-in: 3e60428c4c user: mistachkin tags: globalStateCmd
2014-08-28
15:22
Fix the "fossil bisect chart" so that it always shows CURRENT in between the last BAD and first GOOD. check-in: 36d63c67d2 user: drh tags: trunk
05:54
Merge updates from trunk. check-in: 629891a775 user: mistachkin tags: optFor130, globalStateCmd
05:54
Merge updates from trunk. check-in: cdad2dc0c2 user: mistachkin tags: reviewFor130, optionalMiniz
00:00
Merge updates from trunk. check-in: 937d2f479d user: mistachkin tags: reqdFor130, th1ExprFix
00:00
Fix TH1 expression parsing when there are unbalanced parenthesis. Add more tests. check-in: 00c01d7a36 user: mistachkin tags: th1ExprFix
2014-08-27
22:52
Add another merge test case. check-in: df9880287f user: mistachkin tags: trunk
18:40
Updated changelog for previous commit. check-in: 8b4bcd9d1f user: stephan tags: trunk
16:20
Added menu entry to toggle ln=0 on /info and /artifact pages. check-in: a5b1bef9cf user: stephan tags: trunk
15:15
strglob -> sqlite3_strglob in a few places check-in: d4acf5c450 user: jan.nijtmans tags: trunk
2014-08-26
19:01
"ls" abbrev. for "list": "fossil tag ls" == "fossil tag list" check-in: ce7df88f6d user: bch tags: trunk
00:43
Spacing fix to the build docs. check-in: cf901e536e user: mistachkin tags: trunk
00:41
Further enhancements to the build docs. check-in: fe3887b873 user: mistachkin tags: trunk
2014-08-25
22:29
Merge updates from trunk. check-in: 70ea8c4f48 user: mistachkin tags: optionalMiniz
22:28
Rename EXTRATARGETS to APPTARGETS in the MSVC makefile. check-in: b575811aff user: mistachkin tags: trunk
22:25
Cleanup and unify the 'extra targets' handling. check-in: 6c6f83c4fd user: mistachkin tags: optionalMiniz
21:09
Update the build docs to mention how to enable OpenSSL support with MSVC. check-in: aea5e3d9ca user: mistachkin tags: trunk
20:52
Merge updates from trunk. check-in: 5735181c4d user: mistachkin tags: optionalMiniz
20:51
Manually port all 'cosmetic' fixes from the optionalMiniz branch to trunk. check-in: 894e72b298 user: mistachkin tags: trunk
20:42
Merge updates from trunk. check-in: e38b1ab087 user: mistachkin tags: optionalMiniz
20:38
When compiling with MSVC, enable building of OpenSSL automatically when SSL is enabled. check-in: bdf9c70807 user: mistachkin tags: trunk
17:52
Fix assert in the TH1 expression parser reported on the mailing list. check-in: cd64405786 user: mistachkin tags: th1ExprFix
14:30
The resource compiler workaround in the previous check-in is only needed for MinGW, this check-in makes the MSVC build work again. check-in: 3d84310453 user: mistachkin tags: optionalMiniz
07:00
Fix including the version of miniz in the Windows resource file (for MinGW). check-in: c8019598d4 user: mistachkin tags: optionalMiniz
2014-08-23
06:08
Add miniz as a compile-time feature, leaving zlib as the default compression library. All makefiles should build. The DMC and PellesCGMake makefiles are not yet supported with miniz. Also, when using miniz, OpenSSL support for zlib is disabled in the MinGW makefile. check-in: c693a3365c user: mistachkin tags: optionalMiniz
2014-08-20
14:54
removed double-application of miniz.h patch (doubled the content). Closed-Leaf check-in: 935ccf9d6f user: stephan tags: miniz
2014-08-19
18:49
addremove two files not handled by the previous patch file. check-in: ca5d6f2b48 user: stephan tags: miniz
17:26
Got the last bit of Baruch's patch in. check-in: d8902124d4 user: stephan tags: miniz
16:52
"the zip file patch" from Baruch. check-in: 26ecec6c2c user: stephan tags: miniz
2014-08-18
17:13
Replaced zlib usage with local copy of miniz. Seems to work. check-in: 579ae389ce user: stephan tags: miniz
16:30
Create new branch named "miniz" check-in: f88a2b3656 user: stephan tags: miniz
2014-08-15
12:46
Update the built-in SQLite to version 3.8.6 check-in: ee46563cbd user: jan.nijtmans tags: trunk
09:24
More style fixes, e.g. c/char const/const char/ check-in: 38421a9c99 user: jan.nijtmans tags: trunk
07:31
Fix gcc warning: pointer targets in initialization differ in signedness check-in: 25d6a5f2b3 user: jan.nijtmans tags: trunk
2014-08-14
16:36
Use the abbreviated object description by default. But provide a hyperlink to a detailed description (using the new /whatis web page) if details are omitted. check-in: 3c2d418b60 user: drh tags: trunk
16:01
Add the "brief" query parameter to the "artifact" page, to shorten sometimes lengthy descriptions of the artifact. check-in: 0ac4cead8d user: drh tags: trunk
10:30
diff: when --to is provided but --from is not, default to --from current, per ML suggestion. Closed-Leaf check-in: d5a8940431 user: stephan tags: pending-review
07:06
Cherry-pick [http://www.sqlite.org/src/info/f01d42cc8b00d2b7c4f14defcb05fdc493cf1bfd|f01d42cc8b]: Minor change to unixDelete for VxWorks with a DOS filesystem. check-in: 119cc97040 user: jan.nijtmans tags: trunk
2014-08-13
20:09
Merge updates from trunk. check-in: 0f3084cd16 user: mistachkin tags: globalStateCmd
19:50
Code styling and comment tweaks. check-in: a3cf0e3390 user: mistachkin tags: trunk
07:21
Update <dirent.h> for Visual Studio to latest version 1.20.1 (April 2014). See: [http://softagalleria.net/dirent.php]. check-in: a374824d92 user: jan.nijtmans tags: trunk
07:06
Wiki wysiwyg formatting for IE 7/8/9/10. Patch by Warren Young. check-in: 8dfbcb457a user: jan.nijtmans tags: trunk
2014-08-12
20:18
Update the built-in SQLite to version 3.8.6 beta3. check-in: 75c4808653 user: drh tags: trunk
19:35
Issue a not-found error in CGI if using the "directory:" configuration and there is not PATH_INFO. Ticket [c481aa2fdbc67b7] check-in: ac8e9e555d user: drh tags: trunk
14:48
X-UA-Compatible (MSIE) HTTP header patch from Warren Young. check-in: b7bebbe44f user: stephan tags: trunk
2014-08-11
15:13
Another attempt, taking VxWorks patch on trunk into account. Closed-Leaf check-in: c2d4bd7365 user: jan.nijtmans tags: vxworks
13:57
Update the built-in SQLite to 3.8.6 beta2. check-in: 981e853f6c user: drh tags: trunk
2014-08-08
19:07
Merge the latest Jim Tcl code to trunk, post-0.75 with the 'glob.tcl' fix included. Approved by Jim Tcl release manager Steve Bennett. check-in: 9d7d677559 user: mistachkin tags: trunk
03:57
Merge updates from trunk. Closed-Leaf check-in: 1b35c8023a user: mistachkin tags: autosetup
2014-08-07
10:59
In the command-line shell, report if the ".system" command returns a non-zero result check-in: bfacd6df6d user: jan.nijtmans tags: trunk
10:12
Update referenced OpenSSL version. check-in: 3a93461738 user: jan.nijtmans tags: trunk
10:02
"char const" -> "const char" and various other coding style improvements. No functional change. check-in: 4e18dba698 user: jan.nijtmans tags: trunk
07:13
Follow-up to [3ba28b23a4d7626691b56debae4add06cd24d4ca|3ba28b23a4]: Eliminate unnecessary calls to sqlite3_win32_is_nt(), but now for MSC and PellesC as well. check-in: ffa67c1b9b user: jan.nijtmans tags: trunk
2014-08-06
14:06
Update the built-in SQLite with the InterlockedCompareExchange fix for Win64. check-in: d600c9f854 user: drh tags: trunk
08:07
Use full UUID's for /vdiff pages accessed by clicking on two different check-ins from the timeline. check-in: 78fdf9f5b2 user: jan.nijtmans tags: trunk
07:07
Eliminate unnecessary calls to sqlite3_win32_is_nt(), since fossil only runs on (win32) system were the Wide API is available check-in: 3ba28b23a4 user: jan.nijtmans tags: trunk
01:23
Update the built-in SQLite to the latest 3.8.6 beta from upstream. check-in: f05e002570 user: drh tags: trunk
2014-08-05
17:27
Updates to the "help" text for the tarball command. Add hyperlinks for accessing content on the /cachestat webpage. check-in: b6a5023fae user: drh tags: trunk
10:52
Some code formatting. No change in functionality. check-in: b9b3ce3b39 user: jan.nijtmans tags: trunk
07:06
Remove (newly) incorrect preprocessor check to fix build on WinRT check-in: 855b1a5037 user: jan.nijtmans tags: trunk
2014-08-04
19:22
Added JS to the /eventedit page to colorize the custom color's element (i.e. color preview). check-in: cd02990692 user: stephan tags: trunk
18:29
minor verbiage patch from Christopher M. Fuhrman. check-in: d4aee31257 user: stephan tags: trunk
03:40
Make sure the 'server' command checks for and processes the --files-urlenc option. check-in: 608f0b2371 user: mistachkin tags: trunk
2014-08-03
07:41
merge trunk check-in: b68f65bb69 user: jan.nijtmans tags: vxworks
2014-08-02
21:04
Make sure the 'server' command checks for and processes the --files-urlenc option. Closed-Leaf check-in: d53a7528b5 user: mistachkin tags: filesUrlEncOpt
16:20
Missed a few more corrections for error messages. check-in: dd5743a823 user: andybradford tags: trunk
15:53
Minor error message correction. check-in: 406b2f3201 user: andybradford tags: trunk
2014-08-01
06:13
Correct repository option handling so that specifying a directory name does not cause errors when TH1 hooks are enabled. check-in: 36c4551e7c user: mistachkin tags: trunk
06:13
Correct option handling for the 'winsrv create' command so that the default user name is NULL and the default password is an empty string when passed to the Win32 CreateServiceW API. check-in: 9c2a5c097b user: mistachkin tags: trunk
2014-07-31
21:13
/zip now ignores the .zip extension, analog to how /tar does. Minor doc improvements in /zip and /tar from the ML. check-in: e0199bfc43 user: stephan tags: trunk
20:54
[/help/update|update] doc improvements from the ML. check-in: 8ab520c589 user: stephan tags: trunk
20:46
th1 parse error reporting tweaks from Sergei Gavrikov. check-in: 2ba71f5105 user: stephan tags: trunk
20:44
rss help text tweaks from the ML. check-in: 9a7a82f64e user: stephan tags: trunk
19:02
Upgrade the built-in SQLite to the latest 3.8.6 alpha from upstream. check-in: 5ce85eb6f8 user: mistachkin tags: trunk
2014-07-30
20:19
Use -DSQLITE_WIN32_NO_ANSI compiler flag on mingw. 1) This optimizes the win32 VFS so it doesn't call the function sqlite3_win32_is_nt() over and over again for every file operation. 2) It makes sure that the SQLite bug I just filed in on sqlite-dev will be fixed before the SQLite 3.8.6 release. Since fossil doesn't run on Win95/98/ME anyway, this is fully harmless. Closed-Leaf check-in: fb3e64f0f3 user: jan.nijtmans tags: pending-review
16:43
For most commands, print an error if unknown command-line options are included on the command-line. check-in: 74ac0c925a user: drh tags: trunk
15:40
Call verify_all_options() on most of fossil CLI commands. - Skip all the test-* commands for now (may be unnecessary) - Skip sha1sum, md5sum and artifact because they can take "-" as argument and verify_all_options() would call fatal. Need to handle those differently... - Command with subcommands that have their options are remaining: branch, bisect, cache, configuration, json, sql, stash, tag, ticket, user, wiki. (not sure how to handle those yet..) Closed-Leaf check-in: a426154b3e user: mgagnon tags: verify-all-options
11:52
Update the clone documentation for protocol 3 and the 'cfile' card format. check-in: d16018c8e1 user: drh tags: trunk
11:45
Add the "Path" submenu link on the "/vdiff" web page. check-in: ef6f7dee43 user: drh tags: trunk
06:47
Update clone documentation for clone protocol 3 and cfile cards. Closed-Leaf check-in: 9a69786702 user: andybradford tags: pending-review
2014-07-27
23:18
Fix [http://permalink.gmane.org/gmane.comp.version-control.fossil-scm.user/17266] check-in: c6c05c82fd user: jan.nijtmans tags: trunk
20:52
Proposed fix for corner-case: [http://permalink.gmane.org/gmane.comp.version-control.fossil-scm.user/17266] Closed-Leaf check-in: 0d8cb8e30a user: jan.nijtmans tags: no-initial-commit
19:15
Fix [http://permalink.gmane.org/gmane.comp.version-control.fossil-scm.user/17346] check-in: 14aea4f883 user: jan.nijtmans tags: trunk
18:33
Fix [http://comments.gmane.org/gmane.comp.version-control.fossil-scm.user/17313] check-in: dcb6076572 user: jan.nijtmans tags: trunk
2014-07-26
20:17
Add Joe Prostko's quote on Fossil to the "quotes.wiki" page. check-in: 016fc1aea4 user: drh tags: trunk
2014-07-25
13:12
Update the release-test description of the URL containing ++ to explain that it only works for "fossil ui". check-in: ffef4edceb user: drh tags: trunk
2014-07-24
21:27
Add another flag to the new comment printing algorithm capable of stripping superfluous CR/LFs while preserving other spacing. check-in: d7d265502a user: mistachkin tags: trunk
20:54
Fix boundary case in the new comment printing algorithm that sometimes results in extra new lines. check-in: 4532733830 user: mistachkin tags: trunk
15:46
Upgrade the built-in SQLite to the latest 3.8.6 alpha from upstream. check-in: f39d8a3d24 user: drh tags: trunk
05:56
Improve clarity of the new comment printing algorithm. check-in: 8e7d2a6586 user: mistachkin tags: trunk
05:05
Factor out the common terminal width detection code for comment printing into a new function. check-in: 351de029f3 user: mistachkin tags: trunk
03:52
For the new comment printing algorithm, make sure to indent after forcing a line break due to the original comment text being detected. check-in: 856c60611f user: mistachkin tags: trunk
03:15
Merge from trunk. check-in: 04cc3e2b49 user: mistachkin tags: globalStateCmd
03:14
Cleanup trailing whitespace in 'th_main.c'. check-in: b000db4752 user: mistachkin tags: trunk
03:12
Add new globalState command to TH1, with tests. check-in: 995173d051 user: mistachkin tags: globalStateCmd
2014-07-23
21:52
For the test-comment-format command, also treat the original comment text argument as a file name when the --file option is specified. Fix memory leaks when the --file and --decode options are used together. check-in: 378dad36ba user: mistachkin tags: trunk
21:37
When available, pass the original comment text as well as the (possibly prefixed) comment into comment_print(). Add COMMENT_PRINT_ORIG_BREAK flag to the new comment printing algorithm. Change the width argument for the test-comment-format command into an option. Add --origbreak option to the test-comment-format command. check-in: 0d0b80fd1c user: mistachkin tags: trunk
18:26
Add --file option to the test-comment-format test command. check-in: b1b352e1cc user: mistachkin tags: trunk
04:23
Minor corrections to documentation. check-in: f1b148df7f user: andybradford tags: trunk
2014-07-22
22:26
Do not delete phantom artifacts from the unclustered table. check-in: 3fa7965c64 user: drh tags: trunk
20:33
Add an alternative comment printing algorithm, disabled by default, which permits the pre-existing comment formatting to be preserved. check-in: b6c9d35b1c user: mistachkin tags: trunk
19:56
Add tests for the legacy comment formatting (from trunk). Closed-Leaf check-in: 86f5c18800 user: mistachkin tags: experimental
08:03
Receive updates from trunk. Closed-Leaf check-in: 5c6891b2ab user: andybradford tags: cluster-changes
2014-07-20
13:20
Merge from trunk check-in: c4fca467f7 user: ashish tags: ashish-ipv6
05:09
Correct usage syntax error message for the 'test-comment-format' command. check-in: 68cd1f5b59 user: mistachkin tags: experimental
04:24
Enhance comments that describe the new comment printing function. check-in: 4a5352c25d user: mistachkin tags: experimental
02:35
Add -comfmtflags command line option to set the comment printing flags, defaulting to the legacy comment printing algorithm. check-in: 18a97b3a8f user: mistachkin tags: experimental
02:10
Merge updates from trunk. check-in: 5ea6a95a7b user: mistachkin tags: experimental
2014-07-19
19:20
Allow commits against a closed leaf as long as the new commit is on a different branch. check-in: 619fa857c9 user: drh tags: trunk
19:04
Update config.guess and config.sub from upstream. check-in: 76370b4c97 user: drh tags: trunk
18:40
Add missing period to sentence. check-in: b6959ec2e6 user: andybradford tags: trunk