Arianne Source Code Repositories: Difference between revisions

Jump to navigation Jump to search
Content deleted Content added
imported>Hendrik Brummermann
No edit summary
imported>Hendrik Brummermann
No edit summary
 
(48 intermediate revisions by 4 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 ==

: Server: arianne.cvs.sf.net
: Protocol: pserver for read-only access, extssh for developers
: Repository: /cvsroot/arianne


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




'''Marauroa'''
== Projects using git ==
: 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



'''Marauroa''' has been migrated to git.
'''Marboard'''
: 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
: read-only access: git://git.code.sf.net/p/arianne/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/




== Example .git/config for developers ==
== 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.

<pre>
<pre>
[core]
[core]
Line 29: Line 31:
logallrefupdates = true
logallrefupdates = true
autocrlf = false
autocrlf = false
[branch "master"]
remote = origin
merge = refs/heads/master
[remote "origin"]
[remote "origin"]
url = ssh://USENAME@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 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.



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