54 lines
1.8 KiB
Text
54 lines
1.8 KiB
Text
|
Legacy Worlds development work flow
|
||
|
|
====================================
|
||
|
|
|
||
|
|
Development is based off a set of Git repositories on the web-based repository
|
||
|
|
server. All repositories can be found under https://svn.legacyworlds.com/git/
|
||
|
|
|
||
|
|
|
||
|
|
Repositories
|
||
|
|
-------------
|
||
|
|
|
||
|
|
* Developer repositories: each developer has access to a personal repository,
|
||
|
|
under dev/{developer name} on the server. All developers have read access to
|
||
|
|
the others' repositories.
|
||
|
|
|
||
|
|
Address: https://svn.legacyworlds.com/git/dev/{developer name}
|
||
|
|
|
||
|
|
* Staging repository: this repository is meant to be used as the source for
|
||
|
|
all local repositories. All developers may read from it. However, only
|
||
|
|
TSeeker can push code to it.
|
||
|
|
|
||
|
|
Address: https://svn.legacyworlds.com/git/staging
|
||
|
|
|
||
|
|
* Main repository: this repository contains the code that has been processed
|
||
|
|
by the build system, along with the binaries if the last build succeeded.
|
||
|
|
While all developers can read from it, it should not be used as the source
|
||
|
|
for local copies.
|
||
|
|
|
||
|
|
Address: https://svn.legacyworlds.com/git/main
|
||
|
|
|
||
|
|
|
||
|
|
Branches
|
||
|
|
---------
|
||
|
|
|
||
|
|
On the staging and main repositories, the following branches exist:
|
||
|
|
|
||
|
|
* master - this is the main development branch. All code destined to end up
|
||
|
|
in the next version of Legacy Worlds lives there.
|
||
|
|
|
||
|
|
* milestone1 - maintenance branch for Legacy Worlds Beta 6 milestone 1.
|
||
|
|
|
||
|
|
|
||
|
|
Development process
|
||
|
|
--------------------
|
||
|
|
|
||
|
|
Work on some branch on your local copy.
|
||
|
|
-> Don't hesitate to push to your developer repository on the server
|
||
|
|
as a means of backup.
|
||
|
|
-> Rebase to the original branch whenever it changes.
|
||
|
|
|
||
|
|
When you are done with your work on a branch:
|
||
|
|
1) push to some branch on your developer repository on the server,
|
||
|
|
2) notify TSeeker that the branch should be pulled to the staging repository.
|
||
|
|
While this is easier to handle on IRC, a mail is fine as well.
|