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
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
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
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.
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.
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
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,
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
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
9 matches
Mail list logo