Hi Martin,
On Tuesday 24 April 2007 12:14, Martin Hollmichel wrote:
> > Should I enable http:// access to go-oo.org/git?
>
> this might ease things a bit,
OK, I'll try to ;-)
> but nonetheless if I want to give you
> access to my repository, I need to set up a repository which can be
> access outside the corporate network,
Other projects do it so that on the server, there is one upstream.git tree,
and then a lot of users/kendy.git, users/mh.git, etc. for the branches that
need to be shared between more people. From the corporate network, you would
push the changes there using eg. ssh:// or rsync://.
The workflow I think is the most reasonable for OOo is the following:
- up-stream has one head branch, 'master'
- every other clone (StarOffice, ooo-build, MacOSX port, ...) have 2 head
branches, 'master' and 'origin'
- 'origin' pulls changes just from the parent's 'master' (ooo-build's
'origin' from up-stream 'master', ooo-build Novell edition's 'origin' from
ooo-build 'master', etc.)
- 'master' pulls from 'origin' and from branches that are considered stable
- this way eg. StarOffice can have features that haven't been accepted
up-stream yet, but still they can be easily merged later
- all development happens in branches, that are branched from 'origin', and
later 'master' pulls from them
- branches live until they are merged to up-stream 'master'
- they can be directly in one of the clone, eg. ooo-build.git
- or in user's own tree
Here's a presentation I did for our Novell mini-conference:
http://go-oo.org/git/git-ooo.odp
[I did not want to disclose it yet, but maybe it's the time ;-)]
Regards,
Jan
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
