Re: [Monotone-devel] Re: Cherry-Picking, Renames, Etc.

[Oren Ben-Kiki]

On Monday 29 November 2004 20:47, Oren Ben-Kiki wrote:
> Monotone does have separate merge and update commands - to pick one
> example...

Sorry, I meant *propagate* and update, of course. Propagate actually 
doesn't work into the working set but creates a new revision. It is the 
same idea, though. BTW, why does it do that? Wouldn't it make more 
sense to have a "propagate latest of another branch into the working 
set of this branch" command allowing for manual conflict resolution?

Have fun,

 Oren Ben-Kiki