Advances in (D)VCSes

[imbaczek]

Figured that a new year would be a good time to switch to a better VCS, so I've done a little bit of news aggregation.

Git on Windows is starting to shape up nicely, check out the newest preview (see Featured downloads.) What's even better is that ugly as hell git-gui works and you can do a lot without ever touching the command line. And it Just Works(TM), no obscure config file editing is necessary. (Tested myself!) Currently my favourite.
http://code.google.com/p/msysgit/
Public git hosting (git for windows gets developed there actually): http://repo.or.cz

bzr released version 1.0, which allegedly is much faster than previous releases due to a new file format. Unfortunately, importing the svn repository from a dump file still fails under Windows, so I couldn't perform tests.
http://bazaar-vcs.org/

Mercurial gained prominent users - Mozilla, Sun OpenJDK and Netbeans. Don't know much else, but this says something. Tortoise-like plugin was released recently: http://tortoisehg.sourceforge.net/. Not sure about its quality. Also didn't test.
http://www.selenic.com/mercurial/wiki/

Darcs released a beta of 2.0, David says that conflicts becoming exponential in time are gone now. A lot of Lisp, Haskell and other functional folks use this, and those guys tend to be smart. (But the kernel people tend to be smart, too.) Didn't test.
http://wiki.darcs.net/index.html/DarcsTwo

Subversion 1.5 will be released soon and will feature merge tracking. Local commits are promised, but I'm not sure if they'll make it in this release.
http://svn.collab.net/repos/svn/trunk/w ... notes.html

[LordMatt]

Do all those options work well on Linux?

[imbaczek]

Yeah, pretty much. No tortoise-like UIs, but stuff usually works better under Linux than under Windows.

[imbaczek]

news flash: git on windows now supports git-svn.

http://msysgit.googlecode.com/files/Git ... th-svn.exe

[imbaczek]

I've uploaded spring to github:

http://github.com/imbaczek/spring/commits/master

Currently it's tracking the trunk and receives updates hourly. Currently there isn't much point into it besides that it's a mirror - the gateway isn't bidirectional. Also, github may not be free when it goes out of beta, so don't rely on this repo too much.

Git for Windows is availible at http://code.google.com/p/msysgit/.

[imbaczek]

Since github stopped accepting pushes because spring's over 100MBs, I've moved the repo to gitorious.

http://gitorious.org/projects/spring-svn-mirror

github mirror will probably disappear soon.

[Tobi]

What about trying to get only rts/ (and other spring stuff) in the repo?

I think then the repo ends up far below 100M, which, IMHO would be preferable.

I was trying that for an optional real convert of the engine code to git, I'll try to remember putting online the document I made while doing this.

[imbaczek]

a little problem is that SConstruct lives outside rts/. I'm not sure I want to fight that. Other than that, yes, repo size should drop down significantly.

[Tobi]

Yes that's a PITA. I think I tried almost everything except making some script (for git-fastimport for example), but to no avail yet.

[Auswaschbar]

* BUMP *
(CMake lives in rts/)

But I'm a bit skeptical if it is useful to split stuff that uses basically the same sources in different repositories (rts, unitsync etc).

[jcnossen]

If people are still in favor of a DVCS, maybe mercurial should be given another look? Tortoisehg is pretty nice, i've been using it myself for a while now.
It requires no command line usage (as opposed to the limited functionality of msysgit) which is usually a big plus for windows people (such as me).

[Tobi]

If anything I'd go for git; for one I think it's the only VCS besides SVN that's used by other projects closely related to Spring (good to ask advice etc.), secondly there's already much time invested by various people in importing the repository and working with it etc., and also I don't think you still need commandline on Windows. (only thing I was missing when I used it was git init but this has been added since then to git gui.)

[imbaczek]

command line is still required for things like rebase, but basic things can indeed be done purely in the gui.