Advanced cherry picking

[Forest Bond]

Hi,

On Fri, May 30, 2008 at 10:08:56PM +1000, Erik de Castro Lopo wrote:
> Ben Finney wrote:
> 
> > As I understand it, revisions are dependent on being applied to the
> > working tree in a specific state. What would you expect the result to
> > be if, say, the first three revisions you specify apply cleanly to the
> > local branch, but not the fourth?
> 
> I expect the first three patches applied and to then be given sensible
> options on how to fix it and then options to either continue or back
> out again.
> 
> In my specific case, I know that the patches I want to merge are
> almost exclusively to files that are already in the mainline and
> all the patches I don't want to merge are to files that exist in
> the branch but not in the mainline.

As far as I know, this should mostly just work.  Worst case scenario is that you
end up having to resolve conflicts that bzr would ideally be smart enough to
take care of on its own.

I don't think that bzr tracks merges from cherry picks, but its merge algorithms
are smart enough to detect already-merged changes, so things tend to work out.

(This is my understanding.  I'm not a bzr expert, I just use it a lot.)

-Forest
-- 
Forest Bond
http://www.alittletooquiet.net
http://www.pytagsfs.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080530/3d8c9afe/attachment.pgp