[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] Re: Cherry-Picking, Renames, Etc.
From: |
Oren Ben-Kiki |
Subject: |
Re: [Monotone-devel] Re: Cherry-Picking, Renames, Etc. |
Date: |
Mon, 29 Nov 2004 20:54:25 +0200 |
User-agent: |
KMail/1.7.1 |
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
- [Monotone-devel] Re: Cherry-Picking, Renames, Etc., (continued)
- Re: [Monotone-devel] Cherry-Picking, Renames, Etc., Oren Ben-Kiki, 2004/11/30
- Re: [Monotone-devel] Re: Cherry-Picking, Renames, Etc., Nathaniel Smith, 2004/11/29
Re: [Monotone-devel] Re: Cherry-Picking, Renames, Etc., Oren Ben-Kiki, 2004/11/30
Re: [Monotone-devel] Cherry-Picking, Renames, Etc., Nathaniel Smith, 2004/11/28
- Re: [Monotone-devel] Cherry-Picking, Renames, Etc., Oren Ben-Kiki, 2004/11/29
- [Monotone-devel] Re: Cherry-Picking, Renames, Etc., graydon hoare, 2004/11/29
- [Monotone-devel] Re: Cherry-Picking, Renames, Etc., Oren Ben-Kiki, 2004/11/29
- Re: [Monotone-devel] Re: Cherry-Picking, Renames, Etc.,
Oren Ben-Kiki <=
- [Monotone-devel] Re: Cherry-Picking, Renames, Etc., Bruce Stephens, 2004/11/29
- Re: [Monotone-devel] Re: Cherry-Picking, Renames, Etc., Joel Rosdahl, 2004/11/29
- Re: [Monotone-devel] Re: Cherry-Picking, Renames, Etc., Oren Ben-Kiki, 2004/11/29
- [Monotone-devel] Re: Cherry-Picking, Renames, Etc., graydon hoare, 2004/11/29
- Re: [Monotone-devel] Re: Cherry-Picking, Renames, Etc., Nathaniel Smith, 2004/11/29
Re: [Monotone-devel] Cherry-Picking, Renames, Etc., Nathaniel Smith, 2004/11/29
[Monotone-devel] Re: Cherry-Picking, Renames, Etc., graydon hoare, 2004/11/28