[Scummvm-devel] Switching from SVN to git, mercurial or bazaar

Pawel Kolodziejski aquadran at xtr.net.pl
Sat Oct 24 16:27:19 CEST 2009


On 2009-10-24, at 13:35, Pawel Kolodziejski wrote:

>
> On 2009-10-23, at 10:55, Max Horn wrote:
>
>> To briefly pick up this old discussion:
>>
>> * SF.net by now supports multiple repositories for both Git and
>> Mercurial
>>
>> * TortoiseGit <http://code.google.com/p/tortoisegit/> supposedly
>> improved a lot (and there are other frontends, e.g. for OS X, see http://git-scm.com/tools
>> )
>>
>> Would be interesting if some Windows users could give TortoiseGit a
>> spin.
>
> As you mention TortoiseGit is frontend for git so I installed needed
> git package from http://code.google.com/p/msysgit/ .
> I used native endline conversion option at setup time, there is also
> option use unix endlines or not touch it but they are for other
> scenarios.
> Option for automatic endline conversion is set in TortoiseGit.
> I created git repository of whole scummvm repositories on unix and
> cloned into windows git repository.
> After that I check all kinds of types of files if there are any not
> properly detected files.
> I found all text files and binary files are properly detected, and
> conversion happen when needed.
> There is one thing which I'm not sure if one kind of files should be
> converted or not, but I think not.
> In "web-planet\code\planetvenus\examples\filters\guess-language" there
> are two files: "en.data" and "fr.data".
> In that files conversion happen. If it's wrong, still not much
> important files, which I guess they are not used by us.
>
> I'll do more tests like basic and later more advanced operations on
> branches.
>

I tested some basic things like pull, push, commit, revert, resolve  
conflicts, stash, merge, add, remove, rename, creating patches also  
rebase and all things works as should.
I noticed frontend lack of move files.
TortoiseGit fill similar to TortoiseSVN.

Regarding OS X version of fronted, I tested quite time ago, not  
impressed me, if I right remember it's lack of functionality, I  
remember it was like more viewer usability, but maybe something was  
improved recently.
Not tested more complicated things, but I trust they should works.

About choice to switch to which tool:
I never used mercurial, so no words from me about it, only I can say  
it's not very popular like cvs, svn and git. Similar thing is with  
Bazaar too.
I tested Bazaar myself sometime ago, it's generally similar to git.
Bazaar doesn't support conversion line endings at least when I last  
tried. It was planned as option to properties to each file like in svn.
And I didn't find ready to use tools which do that automatically like  
in tortoisesvn.
Bazaar has nice feature like import whole repositories from svn and  
can be updated later time for synchronization for example.
It's not like git-svn thing, git have copy of svn tree, but in bazaar,  
it convert svn tree into own native repository.
I think Bazaar is not enough mature yet. It's also not easy setup if  
you need plugins. it's lack good gui tools. However exist nice web  
viewer.
Bazaar use commit IDs number and "sub-numbers" (x.x.x) not like git  
hash ID's.

My personal choice would be Git.

> Pawel
>
>
>>
>>
>> Cheers,
>> Max
>>
>> ------------------------------------------------------------------------------
>> Come build with us! The BlackBerry(R) Developer Conference in SF, CA
>> is the only developer event you need to attend this year. Jumpstart
>> your
>> developing skills, take BlackBerry mobile applications to market and
>> stay
>> ahead of the curve. Join us from November 9 - 12, 2009. Register now!
>> http://p.sf.net/sfu/devconference
>> _______________________________________________
>> Scummvm-devel mailing list
>> Scummvm-devel at lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/scummvm-devel
>>
>
>
> ------------------------------------------------------------------------------
> Come build with us! The BlackBerry(R) Developer Conference in SF, CA
> is the only developer event you need to attend this year. Jumpstart  
> your
> developing skills, take BlackBerry mobile applications to market and  
> stay
> ahead of the curve. Join us from November 9 - 12, 2009. Register now!
> http://p.sf.net/sfu/devconference
> _______________________________________________
> Scummvm-devel mailing list
> Scummvm-devel at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/scummvm-devel
>





More information about the Scummvm-devel mailing list