Arianne Source Code Repositories: Difference between revisions

← Older edit

Content deleted Content added

VisualWikitext

Revision as of 14:34, 12 July 2020 view source imported>Hendrik Brummermann No edit summary ← Older edit		Latest revision as of 18:32, 23 December 2025 view source imported>Hendrik Brummermann No edit summary
(One intermediate revision by the same user not shown)
Line 1: The Arianne project currently uses ~~CVS and~~ Git to manage source code. == Projects ~~using git~~ ==▼ '''Stendhal''' : read-only access: ~~git~~https://~~git~~codeberg.~~code.sf.net/p~~org/arianne/~~marauroa~~stendhal.git▼ : read/write access for developers: ssh://~~USERNAME~~git@~~git~~codeberg.~~code.sf.net/p~~org/arianne/~~marauroa~~stendhal.git▼ : Web-based repository viewer: https://~~sourceforge~~codeberg.~~net/p~~org/arianne/~~marauroa/ci/master/tree/~~stendhal▼ ▲== Projects using git == '''Marauroa''' ~~'''Stendhal''' has been migrated to git.~~ : read-only access: ~~git~~https://~~git~~codeberg.~~code.sf.net/p~~org/arianne/~~stendhal~~marauroa.git : read/write access for developers: ssh://~~USERNAME~~git@~~git~~codeberg.~~code.sf.net/p~~org/arianne/~~stendhal~~marauroa.git : Web-based repository viewer: https://~~sourceforge~~codeberg.~~net/p~~org/arianne/~~stendhal/ci/master/tree/~~marauroa '''Marboard''' ~~'''Marauroa''' has been migrated to git.~~ ▲: read-only access: git://git.code.sf.net/p/arianne/marauroa ▲: read/write access for developers: ssh://USERNAME@git.code.sf.net/p/arianne/marauroa ▲: Web-based repository viewer: https://sourceforge.net/p/arianne/marauroa/ci/master/tree/ ~~'''Marboard''' has been migrated to 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 Line 37 ⟶ 35: merge = refs/heads/master [remote "origin"] url = ssh://~~USERNAME~~git@~~arianne~~codeberg.~~git.sourceforge.net/gitroot~~org/arianne/~~marauroa~~stendhal.git fetch = +refs/heads/:refs/remotes/origin/ [user] name = ~~USERNAME~~REPLACE_WITH_FULL_NAME email = ~~USERNAME@users.sourceforge.net~~REPLACE_WITH_EMAIL_ADDRESS </pre> ~~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, use "Merge" or "Rebase" in Eclipse. * some of the dialog are very complicated on first glance. [http://wiki.eclipse.org/EGit/User_Guide Eclipse Git User Guide]