bzr merge usability tweakage

[Michael Ellerman]

On Sat, 28 May 2005 06:22, Aaron Bentley wrote:
> Robey Pointer wrote:
> | 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.
>
> A lot of people complained that Arch had too many commands.

Having lots of commands isn't a problem as I see it. The issue is what's the 
minimal set of commands you need to get work done with the SCM. I think we 
can keep that set small in bzr and still have extra commands for people who 
want them, perhaps not listed in the default help output (maybe).

> My standard argument against "undo" for this kind of behavior is that
> it's not a conventional undo.  It's not what Photoshop or vim mean by
> "undo".  It's 'revert-to-last-saved-version'.  Several people have
> commented that they would expect "undo" to be able to undo a commit, and
> this is nothing like that.

Yeah absolutely. As I see it you either take the darcs approach where undo 
works, but then you're not actually recording history (which Martin says bzr 
will always do), or you don't use the word undo - because it'll just confuse 
people.

It would be nice to have a command that takes a changeset, inverts it, and 
commits that as an "UNDO revision foo" changeset. But that definitely can be 
a plugin/extension. (bzr diff -r x:y | patch -Rp1 | bzr ci -m "UNDO revno x")

I'm not sure if shelve is the right word, but it was all I could think of, I'm 
open to suggestions.

cheers

-- 
Michael Ellerman
IBM OzLabs

email: michael:ellerman.id.au
inmsg: mpe:jabber.org
wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)

We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050528/a86b128c/attachment.pgp