[Zope-Coders] Re: Question about procedures

[Lennart Regebro]

On Thu, 24 Mar 2005 12:16:36 -0500, Tim McLaughlin <tim at siteworx.com> wrote:
> What should we do if no discussion ensues on zope-dev?  Go ahead and
> make the commit to the trunk if it's backwards compatible?

Yeah, sure. If you think the change should be there, if it doens't
break anything, and nobody protests, then it's probably fine.




One of the reasons why using branches even for small fixes (well, not
typos or other completely obvious things) is that it's easy to undo if
it's bad. When the merge to the trunk is in one go, it's easy to undo.
(And trust me, even if you think that your fix is a simple "one commit
only" it quite often turns out to not be. Branches are good. )

The second reason is that it's easy to merge the fix into other
branches, for example you might to commit it both to trunk and to the
1.4 branch.

So for everything above simple typos, use a branch, make a test that
shows the bug, fix the bug, run the tests, test the changes yourself
for a couple of days or so, and then merge it.

That way you make one commit where it's easy to see who fixed it, what
they fixed and why, it's easy to apply it to other brances, and in
worst case, it's easy to undo.

-- 
Lennart Regebro, Nuxeo     http://www.nuxeo.com/
CPS Content Management     http://www.cps-project.org/