merging selective changes from merge directive patch file.

[David Timothy Strauss]

(a) You may be able to shelve the changes you don't want to commit after merging in the merge directive. Not 100% sure on this one. 
(b) You could create a merge staging branch, merge into that, change what you want, and then create a new merge directive. This results in the "excluded" revisions being merged but then effectively undone. 
(c) You could cherry-pick the merge, possibly from a merge staging branch. This results in the excluded revisions not being merged at all. 
----- "Niben M Singh" <niben_s at rocketmail.com> wrote: 
> Hello All - 
> 
> I am very new to Bazaar but am very pleased with it. It's an excellent tool! 
> 
> I have a question about merging from merge directive. If your merge directive contains more than one set of changes then is it possible to choose only the selected change sets from it? I can see the merge history but am just curious whether I can just pick selected changes from there. 
> 
> Niben 
> 
> 

-- 
David Strauss 
| david at fourkitchens.com 
| +1 512 577 5827 [mobile] 
Four Kitchens 
| http://fourkitchens.com 
| +1 512 454 6659 [office] 
| +1 512 870 8453 [direct] 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20090504/602356a8/attachment.htm