General usage questions

[Russ Brown]

John Arbash Meinel wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Russ Brown wrote:
>> 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.
> 
> If you have 'shelf' then you have 'bzr cdiff', also provided by bzrtools.
> 
> I don't know about pager options. Though I think there was a 'less log'
> plugin, or something along those lines.
> 
>>
>> 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?
> 
> There is the 'extmerge' plugin. I haven't used it much myself, but you
> might want to look at it. IIRC it supports meld and kdiff3.
> 
> There are also .BASE, .THIS, and .OTHER files in your working directory,
> which can be given to meld/kdiff3 to resolve.
> 

I actually found both of these myself shortly after posting: that seems 
to happen to me a lot :( I'll be checking these two plugins out shortly.

Thanks for the feedback!

>>
>> I'm sure we'll have more questions as we go along.
>>
>> Thanks!
>>
> 
> John
> =:->
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.6 (GNU/Linux)
> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
> 
> iD8DBQFIJLb9JdeBCYSNAAMRAkJBAJ9kLIcCX84VKAy3yd39Lg2sPFuhEwCghVw9
> 4JT7gyv3XXiHJbQk7DoOw8o=
> =SqJ4
> -----END PGP SIGNATURE-----