[Zope3-dev] Re: [Zope-Coders] Re: [Zope-Checkins] CVS: Zope3/src/ZConfig/tests - test_schema.py:1.10.2.1

[Toby Dickenson]

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. 

-- 
Toby Dickenson
http://www.geminidataloggers.com/people/tdickenson