Lumiera
The new emerging NLE for GNU/Linux

State

Final

Date

2008-04-08

Proposed by

ct

Shared Master Repository setup

This describes how the shared MASTER is set up and syncronized.

Description

We have now a shared master repository in /git/LUMIERA.

  • The public/anonymous git url is git://git.lumiera.org/LUMIERA

  • for people with ssh access it is pushable at UID@git.lumiera.org:/git/LUMIERA.

The repository is maintained by cehteh. It updates daily by a script.

There are the following branches updated from their respective maintainer repositories:

BRANCHNAME DESCRIPTION Updated from…

master

Stable branch; generic entry point.

cehteh, ichthyo

library

Support library development

cehteh, ichthyo

proc

Render core development

ichthyo

backend

Data backend development,

cehteh

gui

GUI development

joel

Automatic syncronization is only done for ‘fast-forward’ updates, conflicting changes are rejected. It is still possible to manually push to this repository to override automatic syncronization.

Comments

Instead of this polling @daily update, maintainers might use git hooks on their repos to push relevant things, be careful not to push cruft or tags (which tags shall be present here is not yet resolved → no tags for now)

ct

2008-04-08T21:48:51Z

Historical remark: This RfC describes the setup we used up to ~2012.
After that point, I was working alone basically (not counting occasional small contributions), and consequently the current state could be found in the “ichthyo” Git repository most of the time — yet the shared master repository is still updated occasionally, as is a mirror at Github

This summer I decided to switch the project over to the Git-flow branching model, knowing from my own professional background that this scheme is a good fit for this kind of project. This has the consequence however that the usage pattern described in this RfC becomes obsolete, as actual development mostly takes place on development or feature branches now, consolidating all progress into the branch integration. The branch master carries only tested and released code going forward.

That being said — the shared master at git://git.lumiera.org/LUMIERA still contains the official state of the Lumiera codebase, while actual development is published first in a repository per developer (so effectively in the Ichthyo repository for the time being); development is consolidated intermittently into the LUMIERA Git.

Back to Lumiera Design Process overview