For a very nice (IMHO) model on how to handle forks take a look at
monotone. Forking is natural, you just want to take precautions to
keep your data safe. A fork is just a branch you haven't given a name
to and didn't necessarily intentionally create. In the case of
monotone it just lets you know
On Tue, Mar 8, 2011 at 11:25 PM, Ron Wilson ronw.m...@gmail.com wrote:
On Tue, Mar 8, 2011 at 8:55 PM, Richard Hipp d...@sqlite.org wrote:
You still haven't told me what a fork is. What topological pattern in
the
DAG am I looking for and reporting?
If 2 or more children of a commit have
Le 11-03-09 06:06, Richard Hipp a écrit :
On Tue, Mar 8, 2011 at 11:25 PM, Ron Wilson ronw.m...@gmail.com wrote:
On Tue, Mar 8, 2011 at 8:55 PM, Richard Hipp d...@sqlite.org wrote:
You still haven't told me what a fork is. What topological pattern
in the
DAG am I looking for and
On Wed, Mar 9, 2011 at 6:06 AM, Richard Hipp d...@sqlite.org wrote:
What if the fork has already been merged back together? Do we still warn
about forks that have already been fixed?
I think it would require 2 things to prevent a warning on a fork-child
where the same push also contained a
On Wed, March 9, 2011 11:46 am, Martin Gagnon wrote:
snip
I'm not sure to understand how those fork work. If my push produce a
fork, all my following push will continue from the same fork point
right?
Yes, unless you do something explicit to change it.
It will not merge back by itself if I
Le 2011-03-09 à 15:52, Eric e...@deptj.eu a écrit :
On Wed, March 9, 2011 11:46 am, Martin Gagnon wrote:
snip
I'm not sure to understand how those fork work. If my push produce a
fork, all my following push will continue from the same fork point
right?
Yes, unless you do something
On Wed, Mar 9, 2011 at 3:52 PM, Eric e...@deptj.eu wrote:
Finally, I don't think there is any way to safely have automatic merging
of forks.
This I agree with and never intended to suggest that forks should ever
be automatically merged.
And, as Richard said, what is a fork?
Something I want
On Wed, Mar 9, 2011 at 6:18 PM, Martin Gagnon eme...@gmail.com wrote:
Agreed. So knowing that, a fork cannot be merged unless we explicitly do it,
so no warning is needed during push in such case.
In the case of an intential fork, I would agree. However, even in a
CMM Level 5 development
On Sat, Mar 5, 2011 at 8:59 PM, Richard Hipp d...@sqlite.org wrote:
(1) The synchronization module has no understanding of checkins, branches,
forks, and whatnot. Giving it that knowledge would be an undesirable
mingling of what is now completely separate functionality.
Maybe have a call from
On Sat, Mar 5, 2011 at 8:27 PM, Ron Wilson ronw.m...@gmail.com wrote:
On Fri, Mar 4, 2011 at 1:28 PM, Joerg Sonnenberger
jo...@britannica.bec.de wrote:
On Fri, Mar 04, 2011 at 01:06:46PM -0500, Ron Wilson wrote:
So, Fossil automatically creates a new branch with not even an
informational
On Tue, Mar 8, 2011 at 4:58 PM, Richard Hipp d...@sqlite.org wrote:
Given
the DAG before the push/pull, and the complete set of changes caused by the
push/pull, can you suggest an algorithm that will answer yes or no as to
whether or not a new fork was created? Bonus points if you can give me
On Tue, Mar 8, 2011 at 8:41 PM, Ron Wilson ronw.m...@gmail.com wrote:
On Tue, Mar 8, 2011 at 4:58 PM, Richard Hipp d...@sqlite.org wrote:
Given
the DAG before the push/pull, and the complete set of changes caused by
the
push/pull, can you suggest an algorithm that will answer yes or no as
On Fri, Mar 4, 2011 at 1:28 PM, Joerg Sonnenberger
jo...@britannica.bec.de wrote:
On Fri, Mar 04, 2011 at 01:06:46PM -0500, Ron Wilson wrote:
So, Fossil automatically creates a new branch with not even an
informational message saying it did that?
That seems like a bug to me.
It's not a
On Sat, Mar 5, 2011 at 8:27 PM, Ron Wilson ronw.m...@gmail.com wrote:
On Fri, Mar 4, 2011 at 1:28 PM, Joerg Sonnenberger
jo...@britannica.bec.de wrote:
On Fri, Mar 04, 2011 at 01:06:46PM -0500, Ron Wilson wrote:
So, Fossil automatically creates a new branch with not even an
informational
Hello,
In order to figure out how to do conflict resolution with fossil, I
created a new repository 'central', I added a file to it, then cloned
the repository into 'clone1' and 'clone2'. I switched off autosync
from all three repositories, then I modified the the same line in
central, clone1
On Fri, Mar 4, 2011 at 5:58 AM, Jan Danielsson
jan.m.daniels...@gmail.com wrote:
Hello,
In order to figure out how to do conflict resolution with fossil, I
created a new repository 'central', I added a file to it, then cloned
the repository into 'clone1' and 'clone2'. I switched off
On Fri, Mar 4, 2011 at 1:22 PM, Martin Gagnon eme...@gmail.com wrote:
On Fri, Mar 4, 2011 at 5:58 AM, Jan Danielsson
jan.m.daniels...@gmail.com wrote:
Hello,
In order to figure out how to do conflict resolution with fossil, I
created a new repository 'central', I added a file to it, then
On Fri, Mar 4, 2011 at 7:22 AM, Martin Gagnon eme...@gmail.com wrote:
I've made you test... and after I push from first clone, it give no
error at all like
there's no conflict. But when I look at the main timeline (with fossil ui)
on central, the change from first clone create a new leaf.
On Fri, Mar 04, 2011 at 01:06:46PM -0500, Ron Wilson wrote:
On Fri, Mar 4, 2011 at 7:22 AM, Martin Gagnon eme...@gmail.com wrote:
I've made you test... and after I push from first clone, it give no
error at all like
there's no conflict. But when I look at the main timeline (with fossil ui)
On Fri, Mar 4, 2011 at 1:28 PM, Joerg Sonnenberger
jo...@britannica.bec.de wrote:
On Fri, Mar 04, 2011 at 01:06:46PM -0500, Ron Wilson wrote:
On Fri, Mar 4, 2011 at 7:22 AM, Martin Gagnon eme...@gmail.com wrote:
I've made you test... and after I push from first clone, it give no
error at all
On Mar 4, 2011, at 19:41 , Martin Gagnon wrote:
But I think it's good to know if we just produce a fork... it might
not be an expected fork...
But usually it's not possible to tell if you're creating a fork (you have no
idea what other developers have in their private repos).
Kind
On Friday, March 4, 2011, Remigiusz Modrzejewski l...@maxnet.org.pl wrote:
On Mar 4, 2011, at 19:41 , Martin Gagnon wrote:
But I think it's good to know if we just produce a fork... it might
not be an expected fork...
But usually it's not possible to tell if you're creating a fork (you
On Friday, March 4, 2011, Remigiusz Modrzejewski l...@maxnet.org.pl wrote:
On Mar 4, 2011, at 19:41 , Martin Gagnon wrote:
But I think it's good to know if we just produce a fork... it might
not be an expected fork...
But usually it's not possible to tell if you're creating a fork (you
23 matches
Mail list logo
