[Zope-Coders] CVS problems

[Toby Dickenson]

On Tuesday 15 Oct 2002 12:36 pm, Lennart Regebro wrote:
> From: "Toby Dickenson" <tdickenson@geminidataloggers.com>
>
> Is it merging all differences from head to my branch?

Thats not precisely correct, but I couldnt explain it any more precisely.

If you want to merge just *your* changes on *your* branch, then you need =
to=20
tell cvs where the communal trunk changes end, and where *your* changes=20
begin.

The best way to do this (got a time machine handy?) is to put a label on =
the=20
trunk at the point where your branch splits.