Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
50 events by user jan.nijtmans occurring around 2013-07-10 13:00:15.
|
2013-07-22
| ||
| 09:23 | rebase ... (check-in: 7b7a4bd579 user: jan.nijtmans tags: merge-integrate) | |
| 08:55 | Better outlining of output from "fossil status", "fossil changes" and "fossil ls --verbose". Let "fossil ls --verbose" differentiate between EDITED, CONFLICT, UPD_BY_MERGE and ADD_BY_MERGE, just like "fossil status" and "fossil changes" ... (check-in: c41d70dccd user: jan.nijtmans tags: trunk) | |
| 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-21
| ||
| 16:29 | rebase ... (check-in: 54aef59916 user: jan.nijtmans tags: cleanX-no-clean-glob) | |
|
2013-07-17
| ||
| 12:04 | merge trunk ... (Closed-Leaf check-in: 5d8551bfa1 user: jan.nijtmans tags: ui-no-utf8) | |
|
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) | |
|
2013-07-12
| ||
| 14:26 | typo ... (check-in: 011a4ad1eb user: jan.nijtmans tags: merge-integrate) | |
| 13:54 | submitTicketCmd() must not return TH_ERROR if ticket_put() fails. ... (check-in: ebfd7020aa user: jan.nijtmans tags: tkt-change-hook) | |
| 12:39 | Better error reporting using fossil_error mechanism. ... (check-in: 97b47ddadf user: jan.nijtmans tags: tkt-change-hook) | |
| 11:38 | rebase ... (check-in: ebc22d22d2 user: jan.nijtmans tags: tkt-change-hook) | |
| 11:33 | rebase ... (check-in: a745092fbc user: jan.nijtmans tags: merge-integrate) | |
| 11:31 | Any vmerge.id < -2 should be handled as a MERGED_WITH by default, not as BACKOUT (even though trunk fossil cannot produce that yet). ... (check-in: 88e60e8ff3 user: jan.nijtmans tags: trunk) | |
| 08:05 | In case of a dry-run, output manifest before printing other information about the merge. ... (check-in: 72713b7d66 user: jan.nijtmans tags: merge-integrate) | |
| 07:58 | Minor tweaks in error/warning messages. Well-tested now. ... (check-in: 5f4b03ebf0 user: jan.nijtmans tags: merge-integrate) | |
|
2013-07-11
| ||
| 15:20 | Implementation complete. Should be thorougly tested now. ... (check-in: 491dd37970 user: jan.nijtmans tags: merge-integrate) | |
| 11:58 | First shot at better error-reporting. ... (check-in: 0dbaf29294 user: jan.nijtmans tags: tkt-change-hook) | |
| 11:28 | wrong default return value. ... (check-in: 3db66bc98f user: jan.nijtmans tags: tkt-change-hook) | |
| 11:03 | Code cleanup. Revert manifest_crosslink() to its original signature. ... (check-in: b63458304d user: jan.nijtmans tags: tkt-change-hook) | |
| 10:46 | Don't allow "tktnew" and "tktedit" pages or the "Common" hook to use the "http" command any more. Don't let "fossil rebuild" run any hooks. ... (check-in: 57d1d2811b user: jan.nijtmans tags: tkt-change-hook) | |
| 08:47 | Implement "fossil merge --integrate" as suggested by Harald Oehlmann. The only part missing is the actual closing of the branch. ... (check-in: b984ecaf1d user: jan.nijtmans tags: merge-integrate) | |
|
2013-07-10
| ||
| 14:05 | Final bug-fixes (I hope) ... (check-in: a27df49629 user: jan.nijtmans tags: tkt-change-hook) | |
| 13:00 | Bug-fixes: - ticket change resulted in ticket hook firing twice. - uuid for commits was determined wrong. ... (check-in: 078c67e0c4 user: jan.nijtmans tags: tkt-change-hook) | |
| 10:22 | Add new "Tranfer Commit" hook, together with UI pages. Move existing "Ticket" hook there as well. ... (check-in: 266aca1c42 user: jan.nijtmans tags: tkt-change-hook) | |
| 10:10 | Only set "seen-delta-manifest" once. ... (check-in: 18d762af88 user: jan.nijtmans tags: trunk) | |
| 08:07 | Some code cleanup. Rename "tkt" variable to "uuid". ... (check-in: 8564e1c6bb user: jan.nijtmans tags: tkt-change-hook) | |
|
2013-07-09
| ||
| 13:06 | rebase ... (check-in: ec9a14a3c9 user: jan.nijtmans tags: tkt-change-hook) | |
| 12:47 | First attempt at getting uuid's available in the push hook script. ... (check-in: d747c14330 user: jan.nijtmans tags: tkt-change-hook) | |
| 12:06 | Properly determine usage of '/', and don't put URL params in "Host:" ... (check-in: 7a63685d73 user: jan.nijtmans tags: tkt-change-hook) | |
| 11:48 | First bug found by testing: URL parameters were not being sent. Maybe url_parse() should be exteded doing that. ... (check-in: 6950cd3666 user: jan.nijtmans tags: tkt-change-hook) | |
| 11:06 | "http-allow-regexp" setting and "http -async" (continuing experiments) ... (check-in: 75a9c981ab user: jan.nijtmans tags: tkt-change-hook) | |
| 08:51 | Fix "fossil commit" when specifying a directory on the command line which doesn't exist. ... (check-in: 062b82c8b0 user: jan.nijtmans tags: trunk) | |
|
2013-07-08
| ||
| 20:07 | limit hook http requests to localhost, unless setting "http-outside" is set. ... (check-in: 2b233e0af2 user: jan.nijtmans tags: tkt-change-hook) | |
| 18:28 | some first security restrictions ... (check-in: 6949032cfe user: jan.nijtmans tags: tkt-change-hook) | |
| 14:58 | add http command to TH1 (untested) ... (check-in: 4467415eda user: jan.nijtmans tags: tkt-change-hook) | |
| 13:51 | Populate ticket uuid for use in Th hook. ... (check-in: 2372e7ecf2 user: jan.nijtmans tags: tkt-change-hook) | |
|
2013-07-05
| ||
| 12:06 | Fix behavior of "fossil commit" on case-insensitive file systems. ... (check-in: c1611f7dfa user: jan.nijtmans tags: trunk) | |
| 06:48 | • Closed ticket [8ee231223d]: fossil ls --age --verbose ignores --verbose plus 5 other changes ... (artifact: d5a146e8d5 user: jan.nijtmans) | |
| 06:46 | Fix [8ee231223d]: fossil ls --age --verbose ignores --verbose ... (check-in: 40d152478a user: jan.nijtmans tags: trunk) | |
|
2013-07-01
| ||
| 09:08 | rebase ... (Closed-Leaf check-in: d57bddaa37 user: jan.nijtmans tags: pending-review) | |
|
2013-06-24
| ||
| 09:53 | rebase ... (check-in: 50d466dcdd user: jan.nijtmans tags: pending-review) | |
| 08:27 | Use file_tree_name(), not file_canonical_name(), as in Richard's example [c8253f4066] for "fossil ls|changes|status" too. Advantage: 1) a panic when an out-of-tree filename is given on the command line 2) shortcut when any command line argument is "." (or resolves to the top of the tree in any other way) ... (check-in: ae01244396 user: jan.nijtmans tags: trunk) | |
|
2013-06-21
| ||
| 14:46 | Oops, forgot to zero the blob. ... (check-in: d09e373878 user: jan.nijtmans tags: trunk) | |
| 14:28 | Enhance [/help?cmd=changes | fossil changes] and [/help?cmd=status | fossil status] the same way. ... (check-in: eb4d631c63 user: jan.nijtmans tags: trunk) | |
| 09:27 | rebase ... (check-in: dfb47a2a2e user: jan.nijtmans tags: cleanX-no-clean-glob) | |
| 08:31 | Fix operation of [/help?cmd=ls | fossil ls] when local files/directories are missing. ... (check-in: c0b98195f9 user: jan.nijtmans tags: trunk) | |
| 07:25 | Allow i64 type to be used in JSON in more places, mainly for time values and file sizes. ... (check-in: f89a32d782 user: jan.nijtmans tags: trunk) | |
|
2013-06-20
| ||
| 15:08 | • Edit [e1cb483a9b582c9b|e1cb483a9b]: Mark "Closed". ... (artifact: 059885b473 user: jan.nijtmans) | |