Re: [Monotone-devel] Commit a child of 2 parents

[Yury Polyanskiy]

I think having another flame war with LM is pointless -- they didn't
touch Andrew because he is under the cover of OSDL.

So external tool is still safer. Especially given that this is a one
time task. I mean nobody uses BK anymore so this tool'd be used only for
one-time conversion from BK to monotone (the idea of tailor is
different: passing csets here and there). 

On Sun, 2006-01-15 at 21:27 -0800, Nathaniel Smith wrote:
> On Sun, Jan 15, 2006 at 10:31:13PM -0500, Yury Polyanskiy wrote:
> > This won't handle all situations: suppose a merge revision that adds a
> > file. I can't direct monotone to add a new file via merge hook.
> 
> Correct.  If you want to do this properly, I see basically two
> options:
>   -- link in sourcepuller and just have "monotone bk_import" (or
>      perhaps "monotone sp_import").  This would probably raise some
>      fuss.  LM probably would be unhappy.  He hasn't actually managed
>      to do anything about SP itself, though, and I'm not aware of any
>      legal theory where he has the slightest leg to stand on, so,
>      *shrug*.  It doesn't seem totally insane.
>      (Totally pragmatically speaking, even if things went pear shaped
>      and we ended up moving the functionality into a separate tool, we
>      would probably get a net win on publicity/sympathy etc.)
>   -- implement merge-via-working-directory.  This is a core piece of
>      functionality for general use, not just for migration.  As
>      mentioned, this is not a large job, just needs to be done.
> 
> If you do go the external program direction, it might be worthwhile
> to see if it can be made somewhat general; most of the code involved
> in importing from BK is probably the same as the code involved in
> importing from any other DAG-history, repo-as-branch VCS (and there
> are a number of these, now).
> 
> -- Nathaniel
> 
>