Q: bzr-explorer external mereg

[Maritza Mendez]

That's what I've done and at the risk of repeating things which have already
been said in other ways, here is the simple advice I give my coworkers.
Maybe it helps someone who stumbles onto this thread.

*How to set up Beyond Compare as your external merge tool in Bazaar Explorer
*
1. Install bzr-extmerge
2. Launch bzr-explorer; navigate to Settings > Configuration > User
Configuration
3. Activate the Merge tab.
4. Add entry: c:\Program Files\Beyond Compare3\Bcomp.exe /ro %b %o %t %r
    Note: the second and third file macros are mapped to the right and
middle Beyond Compare panes, respectively!
5. NEVER click on the Resolve Conflicts icon in the bzr-explorer "What's
next?" pane.
6. ALWAYS right-click on the conflicted file in the Working Tree and use
"Merge conflict" and "Mark conflict resolved"

This seems to work pretty well for us, except when someone thinks he's too
smart to follow instructions.  :)

Note: It would be nice if extmerge simply did argument substitution, but it
seems to reject tool-specific options which run into the file placeholders.
For example, BC3 understands thin /vcsleft=<file> but ext-merge rejects
/vcsleft=%b.  Not a big deal but potentially aggravating for someone trying
to use the command-line recommended by their merge tool.

Thanks,
~M


On Thu, Jun 17, 2010 at 2:23 AM, Gary van der Merwe <garyvdm at gmail.com>wrote:

> On Thu, Jun 17, 2010 at 2:13 AM, Maritza Mendez <martitzam at gmail.com>
> wrote:
> > 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?
>
> Install bzr-extmerge configure it to use your merge tool.
>
> E.g.: I have this in my bazaar.conf:
> external_merge = meld %t %r %o
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20100617/8141693e/attachment.htm