Re: [Libmesh-devel] Bring pre-github history into the repository

[John P. <jwp...@gm...>]

On Fri, Oct 30, 2015 at 11:03 AM, Roy Stogner <roy...@ic...>
wrote:

>
> On Fri, 30 Oct 2015, John Peterson wrote:
>
> Basically:
>> .) Make a git svn clone of the old repo, create a branch called
>> pre_git_libmesh
>> .) Merge upstream/master into pre_git_libmesh
>> .) Merge pre_git_libmesh back into master.
>>
>
> Wait, so we can do this without a force push?
>

Absolutely.  One reason to try a rebase would be to attempt to maintain a
contiguous history for individual files, but I think it would be very
messy, lots of conflicts and things not lining up quite right, plus there
is the *huge* downside of rewriting the entire history of master.  I don't
even know what happens to git submodules which rely on hashes that are
rewritten...



> I've wanted to do this for a while but I'd always assumed that the
> final step in the process would be "cross fingers with one hand, hit
> enter with the other, and pray I don't thereby destroy all our Github
> archives".
>
> IMHO :+1: and don't worry about the ludicrously giant merge commit; a
> few tens of megabytes will be worth it to have "git blame" working
> properly.  Too many times I've glanced at some ancient code and
> wondered whether it was my fault; finally I'll be able to *know* it
> was my fault!
>

OK.  If I don't hear any dissenting opinions I'll push to upstream some
time this afternoon.

-- 
John