Q: bzr-explorer external mereg

[Maritza Mendez]

Wow.  Gary, you must be correct about it being a mess, because I'm not even
sure what it means to everyday users.  At least I no longer feel stupid
about being confused.  (I grep'ed through the code before askign and quickly
realized that I was missing something fundamental about how external merge
tools are set up in bzr-explorer.)

I understand that "messes" take time to untangle.  I'm just glad this is a
known issue and may get some attention.

Meanwhile, if I wanted to "just get my job done" as a developer of
general-purpose software (not bzr) using a third-party GUI 3-way merge tool
*and* I wanted to stay inside the bzr-explorer environment, what do folks
here recommend?

FYI, I personally am happy to drop to the command line and type 'bzr
extmerge' but some of my coworkers like bzr-explorer so much they never want
to leave it.

Thanks!

~M



On Tue, Jun 15, 2010 at 11:15 PM, Gary van der Merwe <garyvdm at gmail.com>wrote:

> On Wed, Jun 16, 2010 at 5:14 AM, Maritza Mendez <martitzam at gmail.com>
> wrote:
> >
> > Is bzr-extmerge required to use bzr-explorer's built-in GUI-based user
> > configuration for external merge tools?
> >
> > I seem to recall that bzr-explorer has it's own way of supporting
> external
> > merge tools without needing bzr-extmerge.
> >
> > But I notice that when I set an external merge app in the bzr-explorer
> gui,
> > it shows up in my bazaar.conf file.
> >
> > I'm perfectly happy using bzr-extmereg from the command-line but I'd like
> to
> > know the preferred practice for bzr-explorer.
> >
> > [Thanks.  I've been out of the loop for a while.]
> >
> > ~M
>
> qconfilicts does not use extmerge
>
> The qbzr tree widget (used in bzr-explorer, qcommit, and qbrowse) does
> use extmerge.
>
> This is a bit of a mess. I would like for qconfilicts to use the tree
> widget. I would also like to include the extmerge functionality in
> either qbzr or bzr core, so that extmerge is no longer required.
>
> But this is on hold will I finish the threads branch.
>
> Gary
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20100616/618b6762/attachment.htm