Re: Switching from old git tree

[David Kastrup]

Sven Axelsson <address@hidden> writes:

> On 14 November 2014 13:20, David Kastrup <address@hidden> wrote:
>> address@hidden (Peder O. Klingenberg) writes:
>>
>>> I have been using the old git-mirror for a while.  In there, I have a
>>> branch with some local modifications.
>>>
>>> I understand that I need to check out a fresh tree now after the
>>> conversion?  What is the smoothest way of integrating my local branch in
>>> this new tree?  I'm a very basic git user, and the only way I can think
>>> of is to extract the patches from my old branch and applying them by
>>> hand in the new tree.
>>
>> Using git format-patch and git am, rather than git diff and git apply.
>>
>>> Is there something else I should be doing instead?
>>
>> I don't think there is much of an option to do something else.
>
> I suppose you could add your old repo as a local remote to the new one, and
> cherry-pick your commits, i.e.:
>
> git remote add old /local/path/to/old
> # Fetch the data to your new repo
> git fetch old
> # Find the commits to pick somehow
> git log old/master
> # Copy to new repo
> git cherry-pick <sha-of-commit>

Well, I was trying to avoid the "double your repository size or no money
back" effect.  While the file and tree blobs in two differently
converted Emacs repositories are presumably pretty much the same, the
entire commit history is disjoint.  Once it takes root in your
repository, it will take a long long time before it gets washed out
again _after_ removing all branches/references to it.  Going through
patches minimizes the data the new repository gets to see from the old
one.

-- 
David Kastrup