monotone-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Christof Petig
Subject: Re: [Monotone-devel] New 'update <rev>' command?
Date: Sat, 20 Nov 2004 17:00:55 +0100
User-agent: Mozilla/5.0 (X11; U; Linux ppc; de-AT; rv:1.7.3) Gecko/20041007 Debian/1.7.3-5

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. ;-)

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

Attachment: signature.asc
Description: OpenPGP digital signature


reply via email to

[Prev in Thread] Current Thread [Next in Thread]