Re: Google Summer of Code 2009: GIT

david@lang.hm writes:

On Thu, 12 Mar 2009, saurabh gupta wrote:

quoted

On Thu, Mar 12, 2009 at 3:17 AM, Junio C Hamano [off-list ref] wrote:

...
with XML files it's possible to be symanticly identical, but not
identical as far as a text merge driver is concerned.
...
a good XML merge driver would have options that you could set for a
particular file type to know about these sorts of things.

Correct.

quoted

quoted

 When it cannot autoresolve,
but there is no way to "mark" a tentative result with conflict markers, it
can do the same thing as the "binary" driver and let the mergetool backend
handle the "driver punted" case.

I think you mean to say that in case, there is a conflict and the
changes don't overlap, then merge driver leaves the file as it is and
the merge helper will handle the file.

if there is a conflict it should be because the changes do overlap. if
they don't overlap why is it a conflict?

Correct.  In such a case when the "driver" can be sure that the result is
reasonable, "helper" should not even kick in.  That was the main point of
my suggestion, which you seem to have got right.

Thanks.