[MERGE] Changed diff filename from *.diff to *_diff.txt to make it easier to open on Windows.
bialix at ukr.net
Wed Feb 25 01:08:43 GMT 2009
Alexander Belchenko пишет:
> Mark Hammond пишет:
>> 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.)
> I guess Gary means: "we could show..." (s/should/show)
>>> * 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 :)
> We have to implement new q-command to show colored unidiff. We already has
> all basic GUI, just need to implement parser of diff files to get the info
> we need.
Well, actually we can simply highlight lines starting with + - and =
and don't parse the diff, if we won't try to show side-by-side view.
>> 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.
> The best thing right now is to use external viewer. Or we need good diff
> parser library written in Python we can use.
> The proposal from Gary makes sense when we talk about bundles or merge-directives.
> Even IIRC TSVN has in the context menu "Patch" command or something similar
> to apply the patch (simple svn diff) to the working tree.
>>> * 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... :)
> Bear with us. Sometimes we wrote bad English prose.
More information about the bazaar