Re: [Fedora Build Service] Why we are developing in develop branch?

[Tim Flink]

On Wed, 27 Feb 2013 18:58:02 +0100
Petr Schindler <pschindl(a)redhat.com&gt; wrote:

>  Hi,
>  
>  I'd like to ask, is there any reason for developing in develop branch?
>  I'm not sure what the right git work flow is, but Kamil was wondering
>  why we do this. My experience is that I tried master firstly and I
>  came to develop after Tim told me about it. Wouldn't be better to
>  develop in master branch? 
I think that it depends on the git branching philosophy used and that's
a project-by-project decision. As long as everyone is on the same page,
I don't think it really matters where development occurs.

Some of this started when it was just Amit and I working on it and it
looks like not everything made it into the docs or on the list - sorry
about that.

On the topic of branching strategies, one of the things that we're doing
with the blocker tracking app is following the 'git flow' branching
strategy [1]. AFAIK, several of the fedora infra apps have started
using the same branch strategy.

[1] http://nvie.com/posts/a-successful-git-branching-model/

The advantage is that changes are isolated and clearly marked - you
don't have to send diffs around, you don't have to worry about when or
where to push changes and it's easy to figure out where to build the
release from. Code related to a specific feature, release or hotfix is
easy to find.

I think it's working well for the blocker tracking app now that we have
a branch naming convention set (feature/tXXX-briefdescription - one
feature branch ignores this but it was created before the convention
was set) but Martin might be a good reference there since he's the
other person dealing with the process there :)

Any objections to using the same process for fedora-build-service?

Tim

BTW, I did start using git flow on fedora-build-service without sending
an email out. This was an attempt to triage an issue that I'm seeing
with cgit and reviewboard that is still ongoing - if there is objection
to using git flow, I can back everything out.