On 1 October 2010 10:00, Chris Hecker <checker at d6.com> wrote: > > Hmm, merge won't actually take files to merge, so I can't bring things > across piecemeal like that. Is there any way to get bzr to do the textual > merge (I know cherrypicks like this aren't tracked) itself? You can say bzr merge -r 9..12 ../other/some-file.c -- Martin