Re: [fossil-users] autosync with fossil merge

2013-07-19 Thread Matt Welland
On Fri, Jul 19, 2013 at 8:39 AM, Richard Hipp wrote: > On Fri, Jul 19, 2013 at 11:24 AM, Matt Welland wrote: > >> For anyone training a large team on using Fossil I can't emphasis enough >> how important it is to get your users comfortable with the distributed >> nature of Fossil *before* allowin

Re: [fossil-users] autosync with fossil merge

2013-07-19 Thread Lluís Batlle i Rossell
On Fri, Jul 19, 2013 at 07:26:57PM +0200, Stephan Beal wrote: > On Fri, Jul 19, 2013 at 7:00 PM, 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 resoluti

Re: [fossil-users] autosync with fossil merge

2013-07-19 Thread Stephan Beal
On Fri, Jul 19, 2013 at 5:24 PM, Matt Welland wrote: > Working off-line is a majority-case? > Sorry, by majority i meant (rather unclearly) the majority of merge cases don't _need_ a sync. -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal ___

Re: [fossil-users] autosync with fossil merge

2013-07-19 Thread Stephan Beal
On Fri, Jul 19, 2013 at 7:33 PM, Lluís Batlle i Rossell wrote: > But I think that the 'autosync' case should not mean 'autosync' for only > some > commands (update, commit) but not all (merge). > That's a good point. > Stephan, I understand that you don't like autosync, but I find it very > use

Re: [fossil-users] autosync with fossil merge

2013-07-19 Thread sky5walk
I don't think "autosync on" depends on the size of the development team. For me it was more a problem due to disconnected repo's from VPN timeouts or actually offline. We turn off autosync and manually push and pull as needed. That way, we are never caught off guard. On Fri, Jul 19, 2013 at 12:08

Re: [fossil-users] autosync with fossil merge

2013-07-19 Thread Stephan Beal
On Fri, Jul 19, 2013 at 7:00 PM, 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 for

Re: [fossil-users] autosync with fossil merge

2013-07-19 Thread Lluís Batlle i Rossell
On Fri, Jul 19, 2013 at 01:43:15PM +0200, Stephan Beal wrote: > On Fri, Jul 19, 2013 at 11:57 AM, Lluís Batlle i Rossell > wrote: > > > I think I wrote this before, but I use autosync, and I often end up making > > a > > "fossil merge" of a locally-outdated branch. It's quite annoying. :) > > > >

Re: [fossil-users] autosync with fossil merge

2013-07-19 Thread Richard Hipp
On Fri, Jul 19, 2013 at 11:24 AM, Matt Welland wrote: > For anyone training a large team on using Fossil I can't emphasis enough > how important it is to get your users comfortable with the distributed > nature of Fossil *before* allowing them to enjoy the benefits of the > connected sync. > I w

Re: [fossil-users] autosync with fossil merge

2013-07-19 Thread Matt Welland
On Fri, Jul 19, 2013 at 4:43 AM, Stephan Beal wrote: > On Fri, Jul 19, 2013 at 11:57 AM, Lluís Batlle i Rossell > wrote: > >> I think I wrote this before, but I use autosync, and I often end up >> making a >> "fossil merge" of a locally-outdated branch. It's quite annoying. :) >> >> Should fossi

Re: [fossil-users] autosync with fossil merge

2013-07-19 Thread Stephan Beal
On Fri, Jul 19, 2013 at 11:57 AM, Lluís Batlle i Rossell wrote: > I think I wrote this before, but I use autosync, and I often end up making > a > "fossil merge" of a locally-outdated branch. It's quite annoying. :) > > Should fossil merge autosync before attempting the merge, if autosync is > set

[fossil-users] autosync with fossil merge

2013-07-19 Thread Lluís Batlle i Rossell
Hello, I think I wrote this before, but I use autosync, and I often end up making a "fossil merge" of a locally-outdated branch. It's quite annoying. :) Should fossil merge autosync before attempting the merge, if autosync is set? Regards, Lluís. ___ f