Re: [opennms-devel] Git Restructuring (Read if you've got a Git branch based on master or 1.6-testing!)

[Alejandro G. <ag...@sy...>]

Hello Ben,

I like your purpose.

I have some questions; just to be sure that I understood:

1. We should always work on a branch of stable/1.6 (for 1.6.x) or master (for 1.7.x), and only merge changes from the new branch after bamboo said that all is ok; Am I right?
2. Work directly on 1.7 and/or 1.6-testing won't be allowed; Am I right?
3. Is there any naming convention for branches? How can I recognize it in bamboo?

For bug fixing, I think that it will be useful that the patch includes a JUnit test as a probe that the problem has been solved.

Maybe use a special name for this JUnit test will not hurt; something like:

void testBug12345() {
}

Alejandro.

On Feb 22, 2010, at 6:05 PM, Benjamin Reed wrote:

> We have run into an issue with the way we're doing branch management
> with Git that didn't translate well from Subversion.  I've put up a
> proposal here describing how we'd like to change it:
> 
> http://www.opennms.org/wiki/Development_Methodology_Rework_Specification
> 
> Please let me know if you have any questions, comments, or changes.  I'd
> like to go ahead and do the switch on Wednesday if possible.  If you
> have a branch based on master (as opposed to 1.7) or 1.6-testing (as
> opposed to 1.6), let me know, and I can help you get it rebased to 1.6
> or 1.7 before the switch happens.
> 
> -- 
> Benjamin Reed
> The OpenNMS Group
> http://www.opennms.org/
> 
> 
> ------------------------------------------------------------------------------
> Download Intel® Parallel Studio Eval
> Try the new software tools for yourself. Speed compiling, find bugs
> proactively, and fine-tune applications for parallel performance.
> See why Intel Parallel Studio got high marks during beta.
> http://p.sf.net/sfu/intel-sw-dev_______________________________________________
> Please read the OpenNMS Mailing List FAQ:
> http://www.opennms.org/index.php/Mailing_List_FAQ
> 
> opennms-devel mailing list
> 
> To *unsubscribe* or change your subscription options, see the bottom of this page:
> https://lists.sourceforge.net/lists/listinfo/opennms-devel