bzr merge usability tweakage

[Erik Bågfors]

On 5/27/05, Robey Pointer <robey at lag.net> wrote:
> 
> 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.

I almost like to put my vote on NOT having undo/shelf in bzr, but
instead have that as a plugin. The reason for this is that we should
keep bzr as simple as possible, and that might mean that we should
support every cool thing we can think of.  Lot's of other SCMs is
popular without shelf.

Now, I like shelf/undo and will use it, but that's why plugins are so great!!!

/Erik