Re: [Monotone-devel] Rosterify and certificate keys

[Nathaniel Smith]

On Tue, Apr 11, 2006 at 10:23:00AM +1000, Daniel Carosone wrote:
> On Mon, Apr 10, 2006 at 11:09:11PM +0200, Richard Levitte - VMS Whacker wrote:
> > The revs in the merge and propagate changelogs are really
> > irrelevant, the ancestors of the merge/propagate are registered
> > separately, and are always correct.  
> 
> The direct ancestors being merged may be, but the chosen common
> ancestor is not (eg, explicit_merge).  I can see this being important
> on some (rare) occasions, though hopefully the need for explicit_merge
> in the future also diminishes!

The capability is also, umm, gone :-):

     explicit_merge LEFT-REVISION RIGHT-REVISION DEST-BRANCH
       merge two explicitly given revisions, placing result in given branch

-- Nathaniel

-- 
In mathematics, it's not enough to read the words
you have to hear the music