Re: emacs.git mirror status

[David Kastrup <dak@gnu.org>]

David Kastrup <dak@gnu.org> writes:

> Andreas Schwab <schwab@suse.de> writes:
>
>> Andreas Schwab <schwab@suse.de> writes:
>>
>>> David Kastrup <dak@gnu.org> writes:
>>>
>>>> Well, if I use something like
>>>>
>>>> git-gui --blame src/xterm.c
>>>>
>>>> in the trunk, it is still Miles who indiscriminately gets all the
>>>> blame for multi-tty.
>>>
>>> Ok, the problem is that I didn't match the log message from the big
>>> multi-tty merge last May.
>>
>> Looking closer, this wasn't a merge, but an import.  So the history is
>> lost, unfortunately.
>
> For git, the sole difference between a merge and an import is that the
> former has the branch as a parent commit.  All the other history is
> reconstructed by git on the fly rather than tracked.  So just
> redeclaring the respective CVS checkins (which can be discerned by the
> log messages) as merges from the respective branch commit should be
> sufficient to let git figure out the corresponding original checkins
> in the branch.

This should be doable with the

git-rewrite-history

command using its --parent-filter option.


-- 
David Kastrup