Advanced cherry picking

[Erik de Castro Lopo]

Ben Finney wrote:

> The 'shelve' extension (made available by installing 'bzrtools') is
> the usual answer to this.

I already use shelve to put uncommited changes aside temporarily.

What I'm talking about is having a hack branch with about 100 commits
of which I want to merge about 60 of them back into mainline.

> I presume by this that you want to separate changes that are not
> bounded by diff hunks?

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.

Erik
-- 
-----------------------------------------------------------------
Erik de Castro Lopo
-----------------------------------------------------------------
"Men are the maintainers of women because Allah has made some of them to excel
others and because they spend out of their property; the good women are
therefore obedient, guarding the unseen as Allah has guarded; and (as to) those
on whose part you fear desertion, admonish them, and leave them alone in their
sleeping places and beat them; then if they obey you, do not seek a way against
them; surely Allah is High, Great."
-- Quran 4:34 http://muslim-canada.org/qawwamuna.html