Re: LCA06 Cogito/GIT workshop - (Re: git-whatchanged: exit out early on errors)

From: Junio C Hamano <junkio@cox.net>
Date: Jan 29, 2006, 20:15 UTC
Message-ID: <7vhd7mkcyz.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20060129101225.GA4815@c165.ib.student.liu.se>

Fredrik Kuivinen <freku045@student.liu.se> writes:

Show 5 quoted lines

> Would it make sense to add an optional
>
>    mergeresult <tree>
>
> line to merge commit objects?

Two issues and a half.

(1) Not all conflicting merge cases can write a sensible
    "conflicted intermediate auto-merge result".  Look for cases
    where we punt in git-merge-one-file.

(2) Modulo issue (1), it can be re-computed if and when needed,
    so this is akin to "storing rename information in the commit
    by detecting renames while merging".

(3) Depending on the direction you pull, you would have
    logically the same "conflicted auto-merge result" that has
    <<< === >>> delimited hunks in reverse.  Which one should
    you record?

And annotate would not be helped much -- if it is needed you could recompute it at that point. Annotate needs to look at the diff from each parent _anyway_ to assign blames.

By the way, I brought up the issue (3) because it relates to how my latest toy "git rerere" works ;-).