General usage questions

[Russ Brown]

Hello,

Continuing our bzr evalution and have some questions about using bzr itself

<context>We're long-time svk users...</context>

Having used bzr for a while I have a couple of questions that I couldn't 
find answered anywhere else.

Is there a way to configure bzr diff to always pipe its output
through colordiff? Some way to get it to pipe that through less
(git-style) would be nice too. Indeed, git has a multitude of options of 
colouring up output of various commands, but I haven't found any for 
bzr. The shelf plugin does it very nicely. I personally find that 
coloured output contributes greatly to clarity.


Next question... In svk, if a conflict is encountered when merging 
between branches you are given a number of options, one of which is to 
resolve the merge in a diff tool (meld, kdiff3 etc).

Obviously, bzr merges work differently in that they are applied to your 
working copy and committed manually, but what I'm looking for is some 
way to easily invoke a given merge resolution tool for conflicts in the 
working copy. Is there such a method?


I'm sure we'll have more questions as we go along.

Thanks!

-- 

Russ.