What is the status of the qbzr diff/merge config bug (489915)?

Patrick van der Velde petrikvandervelde at gmail.com
Tue Oct 12 21:36:47 BST 2010


Hi Gordon

On Wed, Oct 13, 2010 at 01:23, Gordon Tyler <gordon at doxxx.net> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
>
> I am making good progress on my branches of bzr and qbzr to improve
> merge tool configuration. If you're interested in trying my current work
> in progress, you'll need to use bzr from lp:~doxxx/bzr/mergetools and
> qbzr from lp:~doxxx/qbzr/mergetools.

Thanks for the status update. I'll wait till the changes land and
merge the awkward way for now. That's probably the best option for me.

>
>> And on a side note can somebody tell me how to get BzrExplorer to show
>> me diffs of changed files? I just can't seem to find a good way to
>> quickly see changed files and get their diffs (something like the
>> TortoiseSVN - check for changes window)
>
> Just hit the Refresh button in the toolbar when you have the branch
> open. It should show you a list of the changed files in the center pane.

I thought I had that but when I clicked the links to the files it only
opens the file in some random editor (wordpad in my case). And there's
no right-click option either. I noticed that there is a view on the
right that shows the file tree but in order to find out if anything
has changed I'd have to go through all the files.
I guess I'm missing something blatant so I'll try again.

Thanks

Patrick



More information about the bazaar mailing list