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

[Nathaniel Smith]

On Sun, Jan 15, 2006 at 04:21:57PM -0500, Yury Polyanskiy wrote:
> I have a tree at some state. If I want to commit it as a child to ONE
> revision I simply do echo $REVISION >MT/revision; monotone commit.
> 
> Now HOW to commit a tree as a child to TWO revisions? I.e. I want
> current revision to be a child of revA and revB (as if it were a merge,
> though I did all merging already and don't need any monotone merge
> assistance).

As others have noted, there's no sane way to do this at the moment.
Which is totally lame; I'm sorry.  But, now that we have rosters
landed in mainline, getting this sort of interface to merging
implemented is a high priority, and very doable; we have a design and
everything:
    http://venge.net/monotone/wiki/MergeViaWorkingDir
It's just a matter of someone finding the time to make it happen.

(If you are/have any bored hacker friends, it's probably no more than a
few days work... ;-).)

-- Nathaniel

-- 
Damn the Solar System.  Bad light; planets too distant; pestered with
comets; feeble contrivance; could make a better one myself.
  -- Lord Jeffrey