bzr merge usability tweakage

[Robey Pointer]

On 27 May 2005, at 1:32, Michael Ellerman wrote:

> On Fri, 27 May 2005 17:52, William Dodé wrote:
>
>> What do you think about an option to can keep the
>> changes somewhere when we revert ?
>> bzr revert --keep my.patch
>>
>
> You need a shelf my friend!

This reminds me: I'd like to vote for "shelf" just being "undo" with  
special options.  As far as I understand it, it just gives you more  
hands-on control over an undo, and I think we should avoid adding a  
bunch of strange new keywords, since IMHO this is what made tla/arch  
so awkward.

robey