On Fri, 2007-01-12 at 18:14 -0800, Nathaniel J. Smith wrote:
Anyway, the answer to your question is that I'm not proposing anything
at all change in monotone -- that's why I said at the beginning of the
writeup that my note had no practical consequences :-).
I think that merge behavior is one
On Fri, 2007-01-12 at 03:00 -0800, Nathaniel J. Smith wrote:
...
Deterministic merging
=
Beautiful! There's just one point I didn't follow, though.
But, magically, with deterministic *-merge, all orders work the same
-- it even turns out to be possible to merge two
On Fri, 2007-01-12 at 10:35 -0600, Timothy Brownawell wrote:
Because the value of a merge node is chosen from *(node).
The multi-*-merge writup at
http://article.gmane.org/gmane.comp.version-control.revctrl/93
says that *(A) is the minimal set of marked ancestors of A.
Adding labels to
On Fri, 2007-01-12 at 12:57 -0600, Timothy Brownawell wrote:
What you're missing is the minimal part of the definition of *(node).
You don't just union the mark sets of the parent nodes, you take that
union and then run erase_ancestors() on it.
smack self on head of course. Its also sort of
be explicit in the system somehow.
Tricky as this may be to get right, this is something you'd expect every
distributed version control system to address somehow...
Oren Ben-Kiki
___
Monotone-devel mailing list
Monotone-devel@nongnu.org
http
, causing conflicts. I really don't see how you
could even approach trying to make implicit undo work...
Have fun,
Oren Ben-Kiki
___
Monotone-devel mailing list
Monotone-devel@nongnu.org
http://lists.nongnu.org/mailman/listinfo/monotone-devel
= 0; *p = 'a'; is a nonsensical use of
C pointers; this doesn't mean 3-way merge, or pointers, are inherently
useless, or need to be fixed somehow.
Have fun,
Oren Ben-Kiki
___
Monotone-devel mailing list
Monotone-devel@nongnu.org
http
= 0; *p = 'a'; is a nonsensical use of
C pointers; this doesn't mean 3-way merge, or pointers, are inherently
useless, or need to be fixed somehow.
Have fun,
Oren Ben-Kiki
___
Monotone-devel mailing list
Monotone-devel@nongnu.org
http
