Arianne Source Code Repositories: Difference between revisions

Jump to navigation Jump to search
Content deleted Content added
imported>Kymara
imported>Hendrik Brummermann
No edit summary
 
(24 intermediate revisions by 2 users not shown)
Line 1: Line 1:
The Arianne project currently uses CVS and git to manages the source code.
The Arianne project currently uses Git to manage source code.


== Projects still using CVS ==
== Projects ==

'''Stendhal'''
: read-only access: https://codeberg.org/arianne/stendhal.git
: read/write access for developers: ssh://git@codeberg.org/arianne/stendhal.git
: Web-based repository viewer: https://codeberg.org/arianne/stendhal


'''Marauroa'''
: read-only access: https://codeberg.org/arianne/marauroa.git
: read/write access for developers: ssh://git@codeberg.org/arianne/marauroa.git
: Web-based repository viewer: https://codeberg.org/arianne/marauroa


: Server: arianne.cvs.sf.net
: Protocol: pserver for read-only access, extssh for developers
: Repository: /cvsroot/arianne
: Web-based repository viewer: http://arianne.cvs.sourceforge.net/


'''Stendhal'''
: Module: stendhal
'''JMaPacman'''
: Module: jmapacman
'''Marboard'''
'''Marboard'''
: read-only access: git://git.code.sf.net/p/arianne/marboard
: Module: marboard
: read/write access for developers: ssh://USERNAME@git.code.sf.net/p/arianne/marboard
: Web-based repository viewer: https://sourceforge.net/p/arianne/marboard/ci/master/tree/




== Projects using git ==
== Example .git/config for developers ==


'''Note:''' Do not put project specific settings into your .gitconfig file in your home folder but use the config file in the .git folder of the individual projects for those.
'''Marauroa''' has been migrated to git.
: read-only access: git://arianne.git.sourceforge.net/gitroot/arianne/marauroa.git
: read/write access for developers: ssh://USERNAME@arianne.git.sourceforge.net/gitroot/arianne/marauroa.git
: Web-based repository viewer: http://arianne.git.sourceforge.net


== Example .gitconfig for developers ==
<pre>
<pre>
[core]
[core]
Line 34: Line 35:
merge = refs/heads/master
merge = refs/heads/master
[remote "origin"]
[remote "origin"]
url = ssh://USERNAME@arianne.git.sourceforge.net/gitroot/arianne/marauroa.git
url = ssh://git@codeberg.org/arianne/stendhal.git
fetch = +refs/heads/*:refs/remotes/origin/*
fetch = +refs/heads/*:refs/remotes/origin/*
[user]
[user]
name = USERNAME
name = REPLACE_WITH_FULL_NAME
email = USERNAME@users.sourceforge.net
email = REPLACE_WITH_EMAIL_ADDRESS
</pre>
</pre>


[http://wiki.eclipse.org/EGit/User_Guide Eclipse Git User Guide]

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 from 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.



[[Category:Marauroa]]
[[Category:Marauroa]]
[[Category:Marboard]]
[[Category:Marboard]]
[[Category:Stendhal]]
[[Category:Stendhal]]
[[Category:JMaPacman]]