On Fri, Oct 10, 2014 at 8:01 PM, Stephan Beal <sgb...@googlemail.com> wrote:
> On Fri, Oct 10, 2014 at 10:10 PM, Ross Berteig <r...@cheshireeng.com> > wrote: > >> Personally, I wouldn't expect that at all. The "fossil merge" command >> edits the currently open workspace based ... >> > > +1 > > >> The "fossil update" command on the other hand is not about making edits >> to the workspace that need to be ... > > > +1 > > The autosync mechanism is fundamentally about keeping your repository >> synchronized with a remote repository, and has no effect on any open >> workspaces. >> > > +1 > > >> >> IMHO, the principle of least surprise should apply, and argues lightly >> against autosync on merge and is somewhat ambivalent about autosync on >> update. > > > i like autosync on update - it's saved me from forks countless times. > Here is a little more detail on the merge scenario that has confused me and others. NB// there are two general contexts for a merge, merge from a branch or merge from a node. When merging from a node there is no ambiguity and this conversation does not apply. However when merging from a branch there *is* ambiguity. The "don't sync" crowd sees the merge as applying to the tip of the branch as it is currently in your private database. The "please sync" crowd sees the merge as being from the latest on the tip whether I have it currently or not. Neither world view is intrinsically right but I do personally feel that if you intend to get a specific node (the "don't sync" crowd) then specify the node. To be consistent with the fossil closely-coupled model I feel that where possible fossil should autosync. For most of us bandwidth is not an issue and sync can always be turned off. Auto sync before merge and after tagging would have saved me a few support calls from confused users over the past few years :) Just my $0.02. > > -- > ----- stephan beal > http://wanderinghorse.net/home/stephan/ > http://gplus.to/sgbeal > "Freedom is sloppy. But since tyranny's the only guaranteed byproduct of > those who insist on a perfect world, freedom will have to do." -- Bigby Wolf > > _______________________________________________ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > > -- Matt -=- 90% of the nations wealth is held by 2% of the people. Bummer to be in the majority...
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
