[Scummvm-devel] Interspective Innocent Engine

Marcus Comstedt marcus at mc.pp.se
Sun Jul 3 14:33:15 CEST 2011


Tarek Soliman <tarek-spam at zeusmail.bounceme.net> writes:

>>   * (still on innocent branch):
>>     git cherry-pick
>> c15c4013dcae120aa6c6fa51dde4fc6fd7df448a..11ae6499454c0e2b790c807e269f5dc56390257e
>>     i.e. cherry pick all the commits from the "innocent-original" branch
>> since the branching point onto the new "innocent" branch which is based
>> on our git repo history.
>>     WARNING: This will require a significant amount of time, and I think
>> a significant amount of (transient) disk space to complete.

> I am assuming this cherry-picking would flatten (linearize not squish) the history tree.
> I would have gone with git-format-patch and git-am the patches rather than having 2 repos in 1 repo.


There exists an even better solution:  Create a graft-point to replace
the parent of c15c4013 with 8820b6166, and then use "git
filter-branch" to rewrite the innocent-original branch.  This way,
each commit is rewitten with a new parent but is otherwise left
entirely intact.


  // Marcus






More information about the Scummvm-devel mailing list