[Nagiosplug-devel] update for nagios-plugins and debian
ae at op5.se
Thu Oct 13 07:19:28 UTC 2005
Ton Voon wrote:
> On 13 Oct 2005, at 13:52, Andreas Ericsson wrote:
>> A move to git/cogito in preference of CVS would easily help resolve
>> such issues, as merging between branches is embarrassingly simple.
> Is that a move at both ends or just at one side?
That's the whole point. git has excellent support for distributed
repositories, branches and merges between branches so there would only
be one repository where each individual organisation can add their own
branch (or branches) and merge changes between them. Always assuming
changesets doesn't conflict, ofcourse, but that shouldn't often be the case.
The individual organisation branches will live on the organisation side
only, whereas the 'master' head lives on sourceforge (as a
web-repository or whatever). There can be several official branches as
well. It might present problems for the various organisations if they
have identical names, but that's their headache.
Try it out; http://www.kernel.org/pub/scm/git
It comes in RPM's now as well.
I seriously recommend having a look at the gitk tool as well. It's the
best I've seen so far, and git is only 6 months old.
Andreas Ericsson andreas.ericsson at op5.se
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
More information about the Nagiosplugin-devel