Nathaniel J. Smith wrote:
It would also require some way to actually define # for text files --
this algorithm has only been written down for scalars ATM :-).
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
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 08:02 -0800, Oren Ben-Kiki wrote:
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
On Fri, 2007-01-12 at 10:04 -0800, Justin Patrin wrote:
On 1/12/07, Justin Patrin [EMAIL PROTECTED] wrote:
On 1/12/07, Nathaniel J. Smith [EMAIL PROTECTED] wrote:
[snip]
Example 2 (super bonus edition)
===
A more wacky example is:
a
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 10:36 -0800, Oren Ben-Kiki wrote:
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
On 1/12/07, Timothy Brownawell [EMAIL PROTECTED] wrote:
On Fri, 2007-01-12 at 10:04 -0800, Justin Patrin wrote:
On 1/12/07, Justin Patrin [EMAIL PROTECTED] wrote:
On 1/12/07, Nathaniel J. Smith [EMAIL PROTECTED] wrote:
[snip]
Example 2 (super bonus edition)
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
On Fri, Jan 12, 2007 at 04:53:45PM -0800, Oren Ben-Kiki wrote:
One last question :-) Is the idea that the '#' nodes be completely
virtual? That is, if I have two actual versions in monotone, one with a
value of 'a' and one with a value of 'b', and I try to merge them...
what would happen in
