Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
13 check-ins related to "bad-merge"
|
2020-08-16
| ||
| 15:51 | Fixed a recursion bug in fossil.dom.append(e,array) (currently unused, but will be soon). ... (check-in: 2018954b user: drh tags: trunk) | |
| 15:51 | Disable HTTPS redirect for the "test-http" command. That command is used by the "ssh:" transport method and redirects to https will break ssh: transport. ... (check-in: ea6365a8 user: drh tags: trunk) | |
| 15:49 | Fixed a recursion bug in fossil.dom.append(e,array) (currently unused, but will be soon). ... (Closed-Leaf check-in: 154f6484 user: stephan tags: bad-merge) | |
| 15:47 | Disable HTTPS redirect for the "test-http" command. That command is used by the "ssh:" transport method and redirects to https will break ssh: transport. ... (check-in: edf63d73 user: drh tags: bad-merge) | |
| 15:30 | Close multi-remote-fix branch because the issue is now resolved. See https://fossil-scm.org/forum/forumpost/158a67cc53 for some information on what was going on. The solution was to reopen the configuration after it was being prematurely closed. ... (check-in: 4c16a249 user: andygoth tags: bad-merge) | |
| 15:20 | Fix the "fossil clone" command so that it works with "file:" URLs. ... (check-in: 9d2b7cab user: drh tags: trunk) | |
| 14:45 | Merge trunk, since cloning local filesystem repositories still does not work ... (Closed-Leaf check-in: 719dcd29 user: andygoth tags: multi-remote-fix) | |
|
2019-05-18
| ||
| 20:55 | Merge the windows build fix from trunk. ... (Closed-Leaf check-in: d99debe8 user: drh tags: bad-merge) | |
| 20:50 | Check-in [344a3331d34d896776] breaks the build when using openssl-1.0.1 so back it out for now. (Added:) The content is correct, but this check-in shows an unexpected merge. I don't know yet if the extra merge is a bug in fossil or a PBKAC. This check-in was originally to trunk but is now moved to a branch. ... (check-in: 8ac66ef3 user: drh tags: bad-merge) | |
| 18:57 | Improvements to branch linkage from the tooltip. Branch linkage now works even from a file history graph. And the source check-in is always highlighted in the linked timeline. ... (check-in: a27ca27f user: drh tags: tooltips) | |
| 00:19 | Fix harmless compiler warning. ... (check-in: 420244cb user: mistachkin tags: trunk) | |
|
2019-05-17
| ||
| 23:34 | On Windows, avoid using BIO_ptr_ctrl with OpenSSL 1.1.1b as it does not appear to work as expected. ... (check-in: 344a3331 user: mistachkin tags: trunk) | |
|
2019-05-13
| ||
| 21:48 | Merge trunk ... (Closed-Leaf check-in: 91a0d5a5 user: jan.nijtmans tags: openssl-1.1) | |