> Masatake YAMATO <[EMAIL PROTECTED]> writes:
>
> > I have a very fool question.
> >
> > Who's archive is dvc's master tree?
> > It seems that I believed [EMAIL PROTECTED] was the
> > master tree. However, today I got many conflicts with my patches.
>
> Indeed, it was supposed to be, but I didn't quite follow the rule
> (back to the old good time of anarchy-style version-control ;-).
:-) The development style improved Xtla.
> Also, it seems that in some situation, "baz merge --star-merge" does a
> better job than "baz merge".
Maybe this is the first time to hear such an important thing.
In xtla.el of dvc
;;;###autoload
(defun tla-star-merge (from &optional to-tree)
...
(tla--run-tla-async (list (if (tla-has-merge-command) "merge"
"star-merge")
(tla--three-way-merge-option)
(tla--show-ancestor-option)
from)
--star-merge is not passed when I use baz. Why it is not passed to?
> > We should [EMAIL PROTECTED] is our
> > master tree?
>
> This one is the main archive for Xtla, but my dvc--main--0 is
> up-to-date today.
Sorry it was typo.
> Let's say that Stefan's tree is actually the master one (however, I
> can come back as the master archive if you want).
Ok, I'll go wild to the anarchy-style; I'll merge from both of you: Matthieu
and Stefan.
