Advanced cherry picking
Andrew Cowie
andrew at operationaldynamics.com
Sat May 31 01:49:17 BST 2008
On Fri, 2008-05-30 at 15:55 +1000, Erik de Castro Lopo wrote:
> I'm not married to this. If I can do something like a standard
> merge I could live with it. What I would like to do is
>
> bzr merge -r 1021,1022,1025,1026,1031,1032,1032 ../otherbranch
>
> and *only* get the revisions listed.
There is a terminology problem here.
Revisions, as defined by bzr, are snapshots of entire tree state. Most
of, however, think in terms of *patches* against some mainline. The fact
that most revisions have a patch associated with them means this is easy
to confuse.
[and, I speculate, since old-school centralized version control
tools with a single history line have single patches added by
single revisions, this further conflates the terms]
We have heard at great length the reasons why whole-tree revisions are
good for us in the distributed context, and I for one accept those
reasons (and more to the point, those making the argument, which is why
I use Bazaar).
But I must admit frustration that two years on bzr _still_ does not have
beautiful cherry picking support to allow one to isolate and move
patches between branches. It is a workflow that many of us attempt to
engage in. That bzr doesn't Just Work™ here it overshadows what is
otherwise a fabulous tool.
AfC
Sydney
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080531/85b22f3e/attachment.pgp
More information about the bazaar
mailing list