Re: [fossil-users] Two trunks?

2015-04-05 Thread Matt Welland
On Sun, Apr 5, 2015 at 12:48 PM, Joerg Sonnenberger jo...@britannica.bec.de wrote: On Sun, Apr 05, 2015 at 12:39:28PM -0700, Matt Welland wrote: The auto fork merge is the same as the automatic merge that one of the fork creators would have experienced if they had done their commit a few

Re: [fossil-users] Two trunks?

2015-04-05 Thread Joerg Sonnenberger
On Sun, Apr 05, 2015 at 01:56:06PM -0700, Matt Welland wrote: On Sun, Apr 5, 2015 at 12:48 PM, Joerg Sonnenberger jo...@britannica.bec.de wrote: On Sun, Apr 05, 2015 at 12:39:28PM -0700, Matt Welland wrote: The auto fork merge is the same as the automatic merge that one of the fork

Re: [fossil-users] Two trunks?

2015-04-05 Thread Matt Welland
On Sun, Apr 5, 2015 at 2:13 PM, Joerg Sonnenberger jo...@britannica.bec.de wrote: On Sun, Apr 05, 2015 at 01:56:06PM -0700, Matt Welland wrote: On Sun, Apr 5, 2015 at 12:48 PM, Joerg Sonnenberger jo...@britannica.bec.de wrote: On Sun, Apr 05, 2015 at 12:39:28PM -0700, Matt Welland

Re: [fossil-users] Documenting the TH1 extended commands...

2015-04-05 Thread Sergei Gavrikov
On Sat, 4 Apr 2015, Joe Mistachkin wrote: I've committed an initial draft of the documentation for the TH1 extended commands exposed by Fossil. Corrections and feedback are more than welcome. https://www.fossil-scm.org/fossil/doc/trunk/www/th1.md Thanks! It is very very useful page.

Re: [fossil-users] Documenting the TH1 extended commands...

2015-04-05 Thread Sergei Gavrikov
On Sun, 5 Apr 2015, Joe Mistachkin wrote: I've added new info commands and info vars sub-commands on trunk. You can combine the info vars sub-command with uplevel to get the same effect as info globals. Really, you presented even more, info globals and info locals with the laconic info vars.

Re: [fossil-users] Documenting the TH1 extended commands...

2015-04-05 Thread Joe Mistachkin
Sergei Gavrikov wrote: Also, we would add a bit of self-documentation sugar to TH1 language if we provide yet two sub-commands to TH1 [info] command, I mean 'commands' and 'globals' sub-commands. You're right, this was sorely needed. I've added new info commands and info vars

Re: [fossil-users] Two trunks?

2015-04-05 Thread tonyp
But, what if the two forks become incompatible when merged? For your proposed auto-merge to work, it’s enough that the two forks simply touch (alter) different files. An auto-merge would obviously work without producing conflicts as neither fork touches files touched by the other fork. Now,

Re: [fossil-users] Two trunks?

2015-04-05 Thread Matt Welland
On Apr 5, 2015 12:13 PM, to...@acm.org wrote: But, what if the two forks become incompatible when merged? For your proposed auto-merge to work, it’s enough that the two forks simply touch (alter) different files. An auto-merge would obviously work without producing conflicts as neither fork

Re: [fossil-users] Two trunks?

2015-04-05 Thread Joerg Sonnenberger
On Sun, Apr 05, 2015 at 12:39:28PM -0700, Matt Welland wrote: The auto fork merge is the same as the automatic merge that one of the fork creators would have experienced if they had done their commit a few minutes later. They would have gotten a fossil would fork message, done fossil update