[Scummvm-devel] Switching to Git (was Re: Broken Sword 2.5)

[Willem Jan Palenstijn]

On Sat, Aug 07, 2010 at 04:46:22PM +0200, Max Horn wrote:
> Am 07.08.2010 um 15:09 schrieb Bertrand Augereau:
> > Merging renames can be a hassle on large repositories (O(n2) IIRC) (and
> > didn't work correctly at some point in the past) but it does work well at
> > ork with a 60GB working copy including binary assets and source code.
> >
> > Thus I think dumping brutally all the history in a git repository and
> > grafting/refactoring/shuffling incrementally stuff we need as Henry did
> > could be a good solution that could haste the process, as git will probably
> > manage following all the moves.
> 
> Just somebody has to do that work. Also, messing with the repository like
> that would change commit ids, right? So we wouldn't want to do this after we
> started to make the repository public... Or am I missing something?

Yes, you're right. If we want to do this, it would have to be on an
experimental repository before going "live".



There's at least one bit of history that would be nice to edit out:

50329 and 50313 break easily tracing back through SCI's vm.cpp's history due to
some CR/LF mixup.


And as mentioned before, grafting the freesci history into the main tree with
cleaned up commit messages would be very nice too.


-Willem Jan