Arianne Source Code Repositories

The Arianne project currently uses CVS and git to manages the source code.

Projects still using CVS

Server: arianne.cvs.sf.net

Protocol: pserver for read-only access, extssh for developers

Repository: /cvsroot/arianne

Stendhal

Module: stendhal

JMaPacman

Module: jmapacman

Marboard

Module: marboard

Projects using git

Marauroa has been migrated to git.

read-only access: git://arianne.git.sourceforge.net/gitroot/arianne/marauroa.git

read/write access for develoeprs: ssh://USERNAME@arianne.git.sourceforge.net/gitroot/arianne/marauroa.git

Example .git/config for developers

    [core]
            repositoryformatversion = 0
            filemode = true
            logallrefupdates = true
            autocrlf = false
    [remote "origin"]
            url = ssh://USENAME@arianne.git.sourceforge.net/gitroot/arianne/marauroa.git
            fetch = +refs/heads/*:refs/remotes/origin/*
    [user]
            name = USERNAME
            email = USERNAME@users.sourceforge.net

Please make sure, that you use the long form of your Sourceforge email address.

Terms used in git

HEAD

refers to the currently checked out workspace.

master

refers to the commited changes (that is HEAD in CVS)

origin/master

refers to committed changes that have been pushed to Sourceforge.

"commit"

is only local, after a local commit one has to "push" the changes to Sourceforge.

• updating is done by first "fetching" the changes form Sourceforge and then "merging" them.
• on the command line git pull does both things, but i think that is not yet implemented in Eclipse.
• some of the dialog are very complicated on first glance.