merging selective changes from merge directive patch file.

Martin Pool mbp at sourcefrog.net
Mon May 11 03:00:32 BST 2009


2009/4/17 Niben M Singh <niben_s at rocketmail.com>:
> 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.

Yes, you can treat the merge directive just like a branch and do

 bzr merge -r 123 ../foo.diff

(There are some bugs where they don't act precisely like branches, but
we'll fix them eventually.)

-- 
Martin <http://launchpad.net/~mbp/>



More information about the bazaar mailing list