simple use case advice
Chris Hecker
checker at d6.com
Fri Oct 1 01:10:44 BST 2010
Ah, okay, I'll try that. Without the range it would print
bzr: ERROR: extra argument to command merge
Maybe the help merge should be updated for this.
Thanks,
Chris
On 2010/09/30 17:07, Martin Pool wrote:
> 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
>
More information about the bazaar
mailing list