Hi Eric, On Tuesday 24 April 2007 13:59, eric b wrote:
> Le 24 avr. 07 à 12:45, Jan Holesovsky a écrit : > > 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' > > Sorry, I don't understand what you mean with the " clone " MacOSX port. > > Can you explain me ? As discussed on IRC, it's the way the distributed source code management tools work. Each developer has a clone of the repository - the only thing they have in common is the common history. Some of the clones might be public, eg. ooo-build. For the MacOSX it might be useful to have such a public clone as well, because apart from the patches that are integrated regularly (eg. by Pavel in his pjXX CWS'es) you have the aquavcl01 that is needed for all MacOSX builds, and is not integrated upstream yet. So, in this public MacOSX clone, you would have aquavcl01 integrated in the 'master' branch, and still would be able to develop independently from that. Of course - this scenario might be not what you want, it is just a proposal. Either way, input appreciated ;-) Regards, Jan --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
