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

[Nick Knight]

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.

So for example:

Win 32 developments, Branch WIN32: goal to get the current version
compiling and running under windoze

Branch Next version features, Branch FEATURES: goal, implement this list
of features

Bugs branch, a branch for bugs to be fixed under the current release

And so on...

When I have taken this tact in the past, you have to basic rules, after
a commit it much compile etc, as you then tend to have more than one
developer working on any one branch.

-----Original Message-----
From: boxbackup-dev-admin@fluffy.co.uk
[mailto:boxbackup-dev-admin@fluffy.co.uk] On Behalf Of Martin Ebourne
Sent: 31 July 2006 15:41
To: boxbackup-dev@fluffy.co.uk
Subject: Re: [Box Backup-dev] Where to put my bug fixes?

Ben Summers <ben@fluffy.co.uk> wrote:
> We do sort of have branches for different kinds of work, it's just
> they're named by individuals at the moment. Suggestions for better
ways
> of working welcomed.

That worked fairly well initially because there were several people =20
with several changes each, and all had been worked on individually.

It still works well where people are doing their own change or =20
creating scratch branches for playing with.

It becomes suboptimal when people start sharing branches or if there's =20
a major branch being worked on (eg. Chris's windows dev). Maybe there =20
could be a different way of marking 'blessed' branches. Keeping =20
'personal' branches in subdirs by name but under a /branches directory =20
and putting main branches directly at that level could work.

Cheers,

Martin.
_______________________________________________
Boxbackup-dev mailing list
Boxbackup-dev@fluffy.co.uk
http://lists.warhead.org.uk/mailman/listinfo/boxbackup-dev