[bt-devel] Backend Proposal

[Gary Holmlund]

On 06/19/2011 05:25 PM, Raoul Snyman wrote:
> On Sun, 19 Jun 2011 14:54:47 -0700, Gary Holmlund wrote:
>> The work should be done so that there is never a commit that does not
>> compile and run.
> I disagree, on two accounts:
>
> 1. This is why we are using git, or at least supposedly. Instead, we're
> using it just like Subversion. What's the point in a distributed version
> control system if you don't use it in a distributed fashion?
>
> 2. If you can't commit broken code into your own branch, you can't ever
> make real progress. You end up being so afraid of committing broken code
> that tasks become insurmountable because of their size, and you never
> actually start any tasks.
>
> I propose a different workflow:
>
> 1. Everyone should have their own clone on Gitorious. This makes sure that
> we have codebases that are insulated from each other, but we can share code
> when and where necessary.
>
> 2. Once you have a Gitorious clone, you should have a local clone of that
> Gitorious clone. This is the repository you work in. Don't forget to keep
> your master up-to-date with the main repository master.
>
> 3. Use branches. Commit often.
>
> 4. Once you are happy with the status of a branch, push your branch up to
> your personal Gitorious repository, and let others know that they can view
> it. This means that you can get peer feedback on your code and your ideas.
>
> 5. Pull branches from other people to collaborate on tasks.
>
> 6. Use the merge request feature of Gitorious so that you can get the
> above-mentioned feedback from one of the main (or core) developers, and so
> that they can make sure that broken code never enters BibleTime master.
>
> This may sound complicated at first, but it makes use of git's distributed
> nature, Gitorious' collaborative platform, and frees each developer up to
> mess around with the code as much as they like without messing up the main
> code.
>
> My 2c worth.

Perhaps I misspoke a little. My intent was that the master on Gitorious 
should never get in a state where the HEAD not compile and run. I agree 
with using our personal close to get it right before pushing to Gitorious.

Gary