Re: [Monotone-devel] New 'update <rev>' command?

[Nathaniel Smith]

On Sat, Nov 20, 2004 at 05:00:55PM +0100, Christof Petig wrote:
> Nathaniel Smith schrieb:
> >Heya, Joel, noticed the new version of 'update' that you added, that
> >takes a revision argument.  Can you describe what the intended
> >semantics of this are?
> >
> >In my head, the purpose of update is always to "move" your local
> >changes so that they hang off of a different committed version -- it
> >changes what you're making changes relative to.  The algorithm is to
> >merge3 the working directory with the target revision using the
> >current base revision as the common ancestor.  I'm not sure I
> >understand what's happening in your code, but it doesn't look like
> >it's doing that when a revision argument is applied; is it actually
> >doing like a merge-into-working directory or something?
> 
> Perhaps this is similar to the monotone revert <rev> command I always 
> miss and emulate by echo <rev> >MT/revision; monotone revert. ;-)

Sort of, except this version saves local changes; yours can also be
emulated with 'rm -rf * .*; monotone checkout <rev> .' :-)

> Merge into working directory would be a very interesting feature IMHO 
> (it's on my far todo list).

Yes, there's lots of interest in it; I just think 'update' is not the
command that should do it :-).

-- Nathaniel

-- 
Eternity is very long, especially towards the end.
  -- Woody Allen