darcs-style cherry-picking of changes to commit ?

[Michael Ellerman]

On Fri, 2 Dec 2005 19:57, Simon Michael wrote:
> Good evening all.. I'm a happy darcs user, checking out bzr which also
> looks great. Thanks for creating it.

I was also a fan of darcs hunk-selection at commit behaviour, and originally I 
was hoping to add something similar to bzr. (it's still a possibility)

However I've decided now that darcs' behaviour actually encourages bad 
practice, in that it makes it very easy to create revisions that never 
existed in your working tree. This is a bad idea because it means you end up 
with revisions in history that were never built or tested.

A lot of the time that's ok, if it's really easy to tease changes apart. But 
there will come a time, it's happened to me, when you inadvertantly check in 
something that doesn't build - because you forgot a hunk somewhere.

So instead the idea is that if you've got multiple logical changes sitting in 
your working tree, you shelve the ones you're not intersted in for the 
moment, then you build, test and commit. You then unshelve some or all of the 
remaining changes and build/test/commit.

> On #bzr I got this help:
>
> sm: does bzr support cherry-picking changes within a file as well as darcs
> ? ...
> taaz: i think sm is asking about the neat feature of darcs asking about
> each individual line grouping diff in a file as you commit.
> taaz: so you can just commit partial changes to a file
> sm: yes that's what I meant
> ...
> robey: yeah i think the closest bzr behavior is "shelve"
> ...
> robey: but the shelve ui is a bit wonky

Wonky! Bah.

I guess the shelve UI was a bit weird, but I think it's better now. If anyone 
has specific complaints, hi Robey! ;), let me know.

If you're going to try shelve, grab the latest version:

# cd ~/.bazaar/plugins
# bzr branch http://michael.ellerman.id.au/files/shelf_v2

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/20051202/08d787e2/attachment.pgp