[Box Backup-dev] Where to put my bug fixes?

Chris Wilson boxbackup-dev@fluffy.co.uk
Sat, 5 Aug 2006 19:10:27 +0100 (BST)


Hi all,

> I think personnel branches are exactly that, my own scratch branch used 
> for playing around and the changes I am going to make may not even get 
> into any development.
>
> You then have branches which are projects which are agreed by the
> development team. The branch would have a specific goal, a target of
> what it has to achieve at which point it would be merged back into the
> main branch.

I'm viewing my Win32 branch in a slightly different way, at the moment. I 
want to be able to fix reported and discovered bugs in the Win32 client, 
without risking affecting the trunk. I also want to do this in public, so 
that others can see, comment on, compile and test this code. I don't know 
if all the changes will make it into trunk, but I hope so.

So this branch is somewhere between a personal and a project branch. If 
others are happy to bless this branch as a project to fix all reported 
bugs under Win32, then I'm happy to maintain (or co-maintain) that branch 
until it goes away.

I would probably keep a personal branch with my own changes as well, which 
the other developers are less likely to ever agree to merge.

There would be some additional overhead in maintaining an additional 
branch, which I'd like to avoid if possible. The best way that I can see 
to achieve that is for as much as possible of the current win32 branch to 
be merged into trunk, but so far I haven't had any responses to my 
requests to review the changes for merging.

Could I have permission from the development team (especially Ben and 
Martin) to merge any of my Win32 patches, under any conditions? For 
example, anything clearly enclosed in #ifdef WIN32?

Nick, if you can upload your changes to a branch of your own, and let me 
know, then I'll be happy to review them to merge into my tree, at least.

Cheers, Chris.
-- 
_ ___ __     _
  / __/ / ,__(_)_  | Chris Wilson <0000 at qwirx.com> - Cambs UK |
/ (_/ ,\/ _/ /_ \ | Security/C/C++/Java/Perl/SQL/HTML Developer |
\ _/_/_/_//_/___/ | We are GNU-free your mind-and your software |