[Zope3-dev] Re: [Zope-Coders] Re: [Zope-Checkins] CVS: Zope3/src/ZConfig/tests
- test_schema.py:1.10.2.1
Shane Hathaway
shane@zope.com
Thu, 13 Feb 2003 11:32:53 -0500
(Removed cross-post to zope3-dev.)
Toby Dickenson wrote:
> On Thursday 13 February 2003 6:01 am, Andreas Jung wrote:
>
>
>>> - The "backmerged" changes obscure the intent of the branch: it is
>>> now impossible to use the CVS machinery to tell just what changed
>>> on the branch.
>>
>>Sometimes backmerging is necessary when the HEAD has changed a lot and
>>when you are not able/allowed to merge stuff back to the HEAD.
>
>
> In this case I prefer to create a new branch from the current head, merge the
> old branch into it, then forget about the old branch.
Maybe we could get CVS to send batches of emails that all have the same
log message as a single email. That would reduce the noise considerably.
Should we consider alternatives to CVS? Subversion, being free and the
intended successor to CVS, is attractive, but Bitkeeper seems to solve
*all* the troubles we're running into. This chart is amazing:
http://www.bitkeeper.com/Sales.BitKeeper.html
(Let's *not* discuss the Bitkeeper license here, though!)
Shane