Fossil

Timeline
Login

Timeline

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

12 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: a66a14b0 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: e1e9da26 user: mgagnon tags: trunk)
2023-09-19
22:03
Correction of simple typos in patch usage text. (check-in: 9b10bf45 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: ec782260 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: 7c75e47b user: mgagnon tags: trunk)
2023-04-17
21:50
Merge latest changes from trunk. (Closed-Leaf check-in: 88a76afc 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: f035bbc8461da6d2. (check-in: 04e1674c 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: edf03559 user: mgagnon tags: trunk)
2023-01-11
03:06
merge latest change from trunk. (Closed-Leaf check-in: 5d5911e6 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: 8f9f2cb7 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: e5c5622d 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: a821cbf5 user: mgagnon tags: trunk)