Arianne Source Code Repositories: Difference between revisions

Jump to navigation Jump to search
Content deleted Content added
imported>Hendrik Brummermann
No edit summary
imported>AntumDeluge
Stendhal moved to Git. Update Git URLs/links
Line 1: Line 1:
The Arianne project currently uses CVS and git to manages the source code.
The Arianne project currently uses CVS and Git to manage source code.


== Projects still using CVS ==
== Projects still using CVS ==
Line 8: Line 8:
: Web-based repository viewer: http://arianne.cvs.sourceforge.net/
: Web-based repository viewer: http://arianne.cvs.sourceforge.net/


'''Stendhal'''
: Module: stendhal
'''JMaPacman'''
'''JMaPacman'''
: Module: jmapacman
: Module: jmapacman
Line 15: Line 13:


== Projects using git ==
== Projects using git ==

'''Stendhal''' has been migrated to git.
: read-only access: git://git.code.sf.net/p/arianne/stendhal
: read/write access for developers: ssh://USERNAME@git.code.sf.net/p/arianne/stendhal
: Web-based repository viewer: https://sourceforge.net/p/arianne/stendhal/ci/master/tree/



'''Marauroa''' has been migrated to git.
'''Marauroa''' has been migrated to git.
: read-only access: git://arianne.git.sourceforge.net/gitroot/arianne/marauroa.git
: read-only access: git://git.code.sf.net/p/arianne/marauroa
: read/write access for developers: ssh://USERNAME@arianne.git.sourceforge.net/gitroot/arianne/marauroa.git
: read/write access for developers: ssh://USERNAME@git.code.sf.net/p/arianne/marauroa
: Web-based repository viewer: http://arianne.git.sourceforge.net
: Web-based repository viewer: https://sourceforge.net/p/arianne/marauroa/ci/master/tree/




'''Marboard''' has been migrated to git.
'''Marboard''' has been migrated to git.
: read-only access: git://arianne.git.sourceforge.net/gitroot/arianne/marboard.git
: read-only access: git://git.code.sf.net/p/arianne/marboard
: read/write access for developers: ssh://USERNAME@arianne.git.sourceforge.net/gitroot/arianne/marboard.git
: read/write access for developers: ssh://USERNAME@git.code.sf.net/p/arianne/marboard
: Web-based repository viewer: http://arianne.git.sourceforge.net
: Web-based repository viewer: https://sourceforge.net/p/arianne/marboard/ci/master/tree/




Line 59: Line 63:
; "commit" : is only local, after a local commit one has to "push" the changes 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.
* 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.
* on the command line git pull does both, use "Merge" or "Rebase" in Eclipse.
* some of the dialog are very complicated on first glance.
* some of the dialog are very complicated on first glance.