On Fri, Jul 19, 2013 at 07:26:57PM +0200, Stephan Beal wrote: > On Fri, Jul 19, 2013 at 7:00 PM, <sky5w...@gmail.com> wrote: > > > That way, we are never caught off guard. > > > > Until there's an unintended fork, then it leads into an area new users > probably aren't comfortable with - merging and conflict resolution. > Autosync used to be off by default but in practice we saw unintended forks > all too often.
We have two use cases: with autosync and without autosync. People can choose one or the other, no matter the default. But I think that the 'autosync' case should not mean 'autosync' for only some commands (update, commit) but not all (merge). For me autosync means that I can look at the ui of our shared fossil server, and use local operations based on the information I see in the shared webserver (considering that there can be races). I look at the central webserver for branch X, and I know that my local "fossil update X" will bring me there. But annoys me that I want to merge that branch X into my current branch, and it silently gets the *local X* (that can be very outdated), not server's. Stephan, I understand that you don't like autosync, but I find it very useful. :) _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
