[Zope-Coders] CVS problems

[Lennart Regebro]

From: "Toby Dickenson" <tdickenson@geminidataloggers.com>
> If you want to merge just *your* changes on *your* branch, then you need
to
> tell cvs where the communal trunk changes end, and where *your* changes
> begin.
>
> The best way to do this (got a time machine handy?) is to put a label on
the
> trunk at the point where your branch splits.

Aha. So just as when you do the "second batch of changes" you should really
put a label on the branch you are working on before making changes?

OK, I can do that, no problem.

Best Regards

Lennart Regebro, Torped
http://www.easypublisher.com/