| 2009-11-29 12:28:30 |
Alexander Belchenko |
bug |
|
|
added bug |
| 2009-11-29 12:28:39 |
Alexander Belchenko |
qbzr: status |
New |
Confirmed |
|
| 2009-11-29 12:28:41 |
Alexander Belchenko |
qbzr: importance |
Undecided |
High |
|
| 2009-11-29 12:28:52 |
Alexander Belchenko |
tags |
|
qconfig qconflicts qdiff |
|
| 2009-11-29 12:29:05 |
Alexander Belchenko |
description |
There is several bug reports files already , which can be called duplicates, but the truth is: our internal model to configure and work with external diff and merge tools is just awful.
I've just trying to specify merge tool (winMerge) to trying to fix bug https://bugs.launchpad.net/qbzr/+bug/485566, and I found it's completely broken! Because qconfig saves the data in bazaar.conf, but then trying to read them from qbzr.conf.
Regarding diff configuration: there is no clue where to enter command line, no Browse button to select application on windows where you have to provide always the full path to application with forward slashes (sic!).
We need refactor core functionality of external diff/merge tools to separate module and teach all clients (qconfig, qdiff, etc.) to use methods from this module.
Also I'd like to get rid support of extmerge. I don't understand what's the benefits of this plugin, but if really need something from there, we just need to merge extmerge to our codebase and adjust it to match our internal architecture.
Also I want to have registry of known diff and merge tools with required command-line options (for launching merge), so user don;t need to even bother to enter long command line and scripting arguments like %t %r etc., just select favorite tool and you're done. |
There is several bug reports files already , which can be called duplicates, but the truth is: our internal model to configure and work with external diff and merge tools is just awful.
I've just trying to specify merge tool (winMerge) to trying to fix bug https://bugs.launchpad.net/qbzr/+bug/485566, and I found it's completely broken! Because qconfig saves the data in bazaar.conf, but then trying to read them from qbzr.conf.
Regarding diff configuration: there is no clue where to enter command line, no Browse button to select application on windows where you have to provide always the full path to application with forward slashes (sic!).
We need refactor core functionality of external diff/merge tools to separate module and teach all clients (qconfig, qdiff, qconflicts, etc.) to use methods from this module.
Also I'd like to get rid support of extmerge. I don't understand what's the benefits of this plugin, but if really need something from there, we just need to merge extmerge to our codebase and adjust it to match our internal architecture.
Also I want to have registry of known diff and merge tools with required command-line options (for launching merge), so user don;t need to even bother to enter long command line and scripting arguments like %t %r etc., just select favorite tool and you're done.
|
|
| 2009-11-29 12:29:17 |
Alexander Belchenko |
summary |
[master] qconfig: diff/merge configuration needs serious rework |
[master] diff/merge configuration needs serious rework |
|
| 2009-11-29 12:29:54 |
Alexander Belchenko |
description |
There is several bug reports files already , which can be called duplicates, but the truth is: our internal model to configure and work with external diff and merge tools is just awful.
I've just trying to specify merge tool (winMerge) to trying to fix bug https://bugs.launchpad.net/qbzr/+bug/485566, and I found it's completely broken! Because qconfig saves the data in bazaar.conf, but then trying to read them from qbzr.conf.
Regarding diff configuration: there is no clue where to enter command line, no Browse button to select application on windows where you have to provide always the full path to application with forward slashes (sic!).
We need refactor core functionality of external diff/merge tools to separate module and teach all clients (qconfig, qdiff, qconflicts, etc.) to use methods from this module.
Also I'd like to get rid support of extmerge. I don't understand what's the benefits of this plugin, but if really need something from there, we just need to merge extmerge to our codebase and adjust it to match our internal architecture.
Also I want to have registry of known diff and merge tools with required command-line options (for launching merge), so user don;t need to even bother to enter long command line and scripting arguments like %t %r etc., just select favorite tool and you're done.
|
There is several bug reports files already , which can be called duplicates, but the truth is: our internal model to configure and work with external diff and merge tools is just awful.
I've just trying to specify merge tool (winMerge) to trying to fix bug https://bugs.launchpad.net/qbzr/+bug/485566, and I found it's completely broken! Because qconfig saves the data in bazaar.conf, but qconflicts then trying to read them from qbzr.conf.
Regarding diff configuration: there is no clue where to enter command line, no Browse button to select application on windows where you have to provide always the full path to application with forward slashes (sic!).
We need refactor core functionality of external diff/merge tools to separate module and teach all clients (qconfig, qdiff, qconflicts, etc.) to use methods from this module.
Also I'd like to get rid support of extmerge. I don't understand what's the benefits of this plugin, but if really need something from there, we just need to merge extmerge to our codebase and adjust it to match our internal architecture.
Also I want to have registry of known diff and merge tools with required command-line options (for launching merge), so user don;t need to even bother to enter long command line and scripting arguments like %t %r etc., just select favorite tool and you're done.
|
|
| 2009-11-29 13:02:06 |
Alexander Belchenko |
summary |
[master] diff/merge configuration needs serious rework |
[master] external diff/merge configuration needs serious rework |
|
| 2010-02-17 19:34:12 |
Gary van der Merwe |
tags |
qconfig qconflicts qdiff |
extdiff qconfig qconflicts qdiff |
|
| 2010-04-10 10:33:23 |
Ruslan Usifov |
nominated for series |
|
qbzr/trunk |
|
| 2010-09-23 14:45:36 |
Jemsquash |
bug |
|
|
added subscriber Jemsquash |
| 2010-10-13 01:46:00 |
Gordon Tyler |
branch linked |
|
lp:~doxxx/bzr/mergetools |
|
| 2010-10-13 01:46:11 |
Gordon Tyler |
branch linked |
|
lp:~doxxx/qbzr/mergetools |
|
| 2010-10-23 15:56:55 |
niels |
bug |
|
|
added subscriber niels |
| 2010-12-04 05:56:22 |
Gordon Tyler |
branch linked |
|
lp:~doxxx/bzr/mergetools-commands |
|
| 2010-12-13 14:20:14 |
Raphael Barabas |
bug |
|
|
added subscriber Raphael Barabas |
| 2011-03-17 15:31:42 |
Vincent Ladeuil |
bug task added |
|
bzr |
|
| 2011-03-17 15:31:55 |
Vincent Ladeuil |
bzr: status |
New |
Fix Released |
|
| 2011-03-17 15:32:09 |
Vincent Ladeuil |
bzr: assignee |
|
Gordon Tyler (doxxx) |
|
| 2011-03-17 15:32:14 |
Vincent Ladeuil |
bzr: milestone |
|
2.4b1 |
|
| 2011-06-25 12:18:22 |
Alexander Belchenko |
qbzr: assignee |
|
Gordon Tyler (doxxx) |
|
| 2011-06-25 12:18:26 |
Alexander Belchenko |
qbzr: status |
Confirmed |
Fix Committed |
|
| 2011-06-25 12:18:30 |
Alexander Belchenko |
qbzr: milestone |
|
0.21b2 |
|
| 2011-06-25 12:18:37 |
Alexander Belchenko |
bzr: importance |
Undecided |
Medium |
|
| 2011-06-25 12:19:55 |
Alexander Belchenko |
branch linked |
|
lp:~qbzr-dev/qbzr/mergetools |
|
| 2011-06-25 12:22:15 |
Launchpad Janitor |
branch linked |
|
lp:qbzr |
|
| 2011-06-25 12:22:20 |
Alexander Belchenko |
qbzr: status |
Fix Committed |
Fix Released |
|
