[MERGE] Changed diff filename from *.diff to *_diff.txt to make it easier to open on Windows.
Mark Hammond
skippy.hammond at gmail.com
Wed Feb 25 00:45:37 GMT 2009
On 25/02/2009 9:38 AM, Gary van der Merwe wrote:
> On Wed, Feb 25, 2009 at 12:22 AM, Mark Hammond<skippy.hammond at gmail.com>
>> What *is* the usual approach for qbzr? If we don't have a .diff viewer,
>> then there doesn't seem to be anything useful we can to the
>> .diff/.patch/.bundle extensions at install time?
>
> * We could should the revisions in the bundle, against the branch you
> are going to merge in qlog (something that qmerge should be doing.)
> * We could show a diff based on the revision data in the bundle, not
> the patch text.
I think these would be a little confusing; I don't even quite understand
from the descriptions exactly how what I would see relates directly to
the file I clicked on :)
IMO, the only reasonable thing to do by default is show a simple diff
viewer - anything else looks a little like a square peg in a round hole.
> * We can open the merge dialog?
I think (optionally) adding a specific 'Merge' verb to those extensions
*does* make good sense - meaning the user needs to use the context menu
to get at it - but I don't think the default action should be a merge.
IMO, YMMV, etc... :)
Cheers,
Mark
More information about the bazaar
mailing list