Fossil

Timeline
Login

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

18 most recent check-ins by user mgagnon

2024-02-04
22:12
Add missing "#include <errno.h>" that was needed on previous commit. ... (check-in: a66a14b033 user: mgagnon tags: trunk)
2023-12-14
16:29
Improve "whatis" output when in "filename" mode and parse supported whatis options when using "fossil all whatis". ... (check-in: e1e9da26f6 user: mgagnon tags: trunk)
2023-09-19
22:03
Correction of simple typos in patch usage text. ... (check-in: 9b10bf4575 user: mgagnon tags: trunk)
2023-05-09
21:44
Fix sub-command parsing in order to have the "gdiff" subcommand of the "patch" command working. ... (check-in: ec78226014 user: mgagnon tags: trunk)
2023-04-19
01:46
Produce merge conflict mark during merge when file exist in current version and in version to be merged, but not in common ancestor. ... (check-in: 7c75e47b3c user: mgagnon tags: trunk)
2023-04-17
21:50
Merge latest changes from trunk. ... (Closed-Leaf check-in: 88a76afc2c user: mgagnon tags: merge-conflict-when-no-file-on-pivot)
2023-03-16
02:08
Produce merge conflict mark during merge when file exist in current version and in version to be merged, but not in common ancestor. Related forum discussion including test script: [forum:f035bbc8461da6d2]. ... (check-in: 04e1674c75 user: mgagnon tags: merge-conflict-when-no-file-on-pivot)
2023-01-13
18:38
Backout change on "login-group join" command which broke the usage of it outside an opened checkout (using -R flag). Change usage text to match the command behavior properly when using the -R flag. ... (check-in: edf0355961 user: mgagnon tags: trunk)
2023-01-11
03:06
merge latest change from trunk. ... (Closed-Leaf check-in: 5d5911e6fd user: mgagnon tags: no_ssh_sync_ip_resolve)
02:51
Make proxy setting "system" by default to use http_proxy environment variable. Closer to old behavior and conform with most programs on Unix-like system. ... (check-in: 8f9f2cb7cd user: mgagnon tags: trunk)
2023-01-06
21:33
Do not try to resolve the IP from the hostname when syncing using ssh:// protocol. Ssh may use the provided name as an alias defined in ~/.ssh/config which may not be resolvable or even resolve to an unrelated ip. This change can potentially avoid long timeout during name resolution failure. Equivalent to [52f08008e2790a81]. ... (check-in: e5c5622d4b user: mgagnon tags: no_ssh_sync_ip_resolve)
2023-01-05
17:21
Add the "-f|--file" flag to the "whatis" command which consist to search for any other files in the repo with the exact same content as the given file. ... (check-in: a821cbf522 user: mgagnon tags: trunk)
2022-09-21
17:14
Backup any unmamaged files that are about to be overwritten by an update or merge. Potentially avoid the loss of a local file if the overwrite warning goes unnoticed, in which case undo is useless. ... (check-in: e99e58c568 user: mgagnon tags: trunk)
16:52
Fix a typo in comment (no code change) ... (check-in: 1356151980 user: mgagnon tags: trunk)
2022-06-04
16:21
Mention the remote-url url overrite by proxy bug fix in the change log. ... (check-in: 5f6093314b user: mgagnon tags: trunk)
2022-05-11
15:42
Fix remote-url overwriting by proxy url bug and use the http_proxy environment variable only when explicitly requested by setting the proxy setting to "system". ... (check-in: a791d5e805 user: mgagnon tags: trunk)
15:34
Only use the "http_proxy" environment variable if it is set to "system", if unset or set to "off", always use direct http connection. ... (Closed-Leaf check-in: a242bb727e user: mgagnon tags: fix_remote_url_overwrite_with_proxy)
15:06
Merge in latest changes from trunk ... (check-in: 5605aef9b9 user: mgagnon tags: fix_remote_url_overwrite_with_proxy)