On Jun 7, 2018, at 7:04 PM, Warren Young <war...@etr-usa.com> wrote: > > I’ve set .fossil-settings/allow-symlinks to 1 in one of my repositories, so > in order to avoid the complaint from Fossil about a conflict, I also say > “fossil unset allow-symlinks” in the checkout.
There’s a related bug that I forgot to mention: the code that checks for settings conflicts is running before “fossil unset” is handled, so you get a bogus complaint about the conflict from the command that is resolving the conflict. This can give the incorrect impression that your command didn’t do anything, but on giving another Fossil command, the conflict has indeed gone away. …until you fossil conf pull all, of course. :) _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
