Merge Diff Extension

[Na'Tosha Bard]

On Mon, Mar 12, 2012 at 12:05 AM, Martin Geisler <mg at lazybytes.net> wrote:

> "Na'Tosha Bard" <natosha at gmail.com> writes:
>
> > On Sun, Mar 11, 2012 at 8:40 PM, Matt Mackall <mpm at selenic.com> wrote:
> >
> >>
> >>
> >> I agree. The theory behind this extension is.. a little fuzzy but
> >> basically ok. But I would frankly tweak the output to be less
> >> diff-like (there's no chance in hell it'll ever work with patch) and
> >> more user-friendly.
> >
> > I do agree the output in particular is a little wonky.  I'll try a few
> > things and see what I can come up with and send some ideas and example
> > output.
>
> I can see that the output from mergediff "roughly emulates" the combined
> diff format from Git:
>
>  http://schacon.github.com/git/git-diff.html#_combined_diff_format
>
> Maybe you could make it more (or exactly) like that output? I think it's
> good to follow an already established format for this, unless there are
> flaws in that output that you want to correct?


Well, I actually think mergediff extension is better than git's combined
diff format overall -- for example, when I tried it out (granted, several
months ago; I'll try to find some time to try it out again next week and
verify), it seemed like git's combined diff format could not show new
changes introduced in the merge (outside of conflict resolution).  Of
course, people shouldn't do that, but *if* they do, I want to see it, so I
can reject the merge.  The mergediff extension does show these changes.

The thing that i really don't like is that the parts that are conflict
resolution just need to show up in a more obvious fashion, because they are
the interesting bits, but can currently get overlooked when looking at a
large merge.  But I'm not sure how to achieve that.  Maybe it can't really
be done so well in a terminal, but in a GUI tool, where different
colored hi-lighting can be used, it could be.

Cheers,
Na'Tosha
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20120312/c817c24c/attachment.html>