QBzr

Can't add more than one exernal merge app

Bug #596243 reported by Greg
10
This bug affects 2 people
Affects Status Importance Assigned to Milestone
QBzr
Confirmed
Medium
Unassigned

Bug Description

I can't add more than one external merge app. Attempting to add a second one, replaces the first one.

Step:
1) Navigate to Settings -> Configuration -> User Configuration -> Merge dialog
2) Click 'Add' to add an new Definition, enter a command line like 'Diffuse %r %b %t %o'. Click 'OK'.
3) Repeat steps 1-2 to try and add another different merge app.
4) Observe that the last line you enter replaces the first one if you select it as default, or is otherwise lost, when you navigate back to this configuration dialog.

See original description
Tags: qconfig
Greg (gregspecialsource)
description: updated
Revision history for this message
Alexander Belchenko (bialix) wrote :

As I can see qconfig loses any non-active merge application definitions. Or maybe store only active one in bazaar.conf?

In the latter case we should de-activate Add button and activate Delete button.

affects: bzr-explorer → qbzr
Changed in qbzr:
importance: Undecided → Medium
status: New → Confirmed
tags: added: qconfig
Revision history for this message
Martitza (martitzam) wrote :

This is still a problem as of qbzr 0.19.3 for external merge tools.

Incidentally, I cannot even add a single external diff tool -- its even more broken.

Revision history for this message
Greg (gregspecialsource) wrote :

Just a thought, not sure if it relates to this feature specifically...

In addition to configuring external Diff & Merge tools, it would be very useful to allow users to configure when specific tools are used.

For example, there is some difference in these scenarios:
Diff single file for quick preview of changes
Diff single file to review and revert changes
Diff multiple files for quick summary / preview
Diff multiple files in general
Merge to resolve conflict

For some of the above scenarios, I'm happy to use the built in Diff, for others, I want to launch my 3rd party app.
In the case of multiple files, if it is known in advance that multiple files need comparing, some 3rd party tools have extra command line params to allow tabbed diff for multiple file sets. I notice in Bazaar Explorer (heavily using qbzr), there are many 'diff' buttons but they do not all behave the same way as far as launching the built in or 3rd party tools.

I suppose to summarize I'm trying to point out:
1) Diff and Merge tools have a variety of usage scenarios, in particular, summarize, compare, edit.
2) The built in Diff is pretty good for some usage scenarios
3) 3rd party Diff and Merge tools may have different or extended parameters when handling single or multiple file sets.

Anyway, just thought I'd bring this up in case it relates to the design of the new and improved external tools configuration.

To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.