QBzr

Command line parameters for Diff and Merge?

Asked by Greg

I would like to know the complete set of possible command line parameters available to the external Diff and Merge tools.

Specifically, I'd like to use original file paths and revision numbers to title the comparison windows so it is clear which window contains which version.

At present, Merge is somewhat workable as the %b %t %o %r at least imply general origins so I can title the windows 'base', 'this' etc. though that is still inadequate.

I hope this is possible as it is an important usability feature.

Question information

Language:
English Edit question
Status:
Solved
For:
QBzr Edit question
Assignee:
No assignee Edit question
Solved by:
Gordon Tyler
Solved:
Last query:
Last reply:
Revision history for this message
Launchpad Janitor (janitor) said : 		#1

This question was expired because it remained in the 'Open' state without activity for the last 15 days.

Revision history for this message
Gordon Tyler (doxxx) said : 		#2

bzr doesn't provide anything more than the file paths currently. Could you describe in more detail what information you are looking for?

Revision history for this message
Greg (gregspecialsource) said : 		#3

I was mainly interested in:

Revision number
Repository file path (not temporary file path)
Location name (branch / project name)

With this info, a 3rd party diff/merge tool could label the views with useful names like:
Main src\proj\file.cpp v1.13 <-> Local src\proj\file.cpp v1.26

Perhaps there are other useful bits of information in addition to what I mention.

At present, I see two temporary file names which can be confusing enough it can take some time to figure our which version is which on screen!

Revision history for this message
Best Gordon Tyler (doxxx) said : 		#4

I'm currently working on improvements to the external merge tool
integration, which will most likely be applied to the external diff tool
integration in the future as well. I will take these suggestions into
consideration.

Revision history for this message
Greg (gregspecialsource) said : 		#5

Thanks Gordon Tyler, that solved my question.