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

Bertrand Augereau bertrand_augereau at yahoo.fr
Sat Aug 7 15:09:43 CEST 2010


> I don't know enough about git to give an informed answer on
> that.
> However, what I do know is that at work we just switched
> from cvs to
> git, and we just dumped everything in a single repository
> to begin
> with, in the knowledge that we could shuffle it round
> afterwards, and
> it has worked very well, much less painful than I imagined.
> But we
> haven't done the shuffling yet ;-)


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.



      





More information about the Scummvm-devel mailing list