[Zope-Coders] CVS problems

[Toby Dickenson]

On Tuesday 15 Oct 2002 11:16 am, Lennart Regebro wrote:
> OK, so I've created a branch from head, made changes, committed them, a=
nd
> merged then into HEAD and Zope-2_6-branch. Worked like a charm.
>
> Today I try to do the same, and merging into head worked fine, but merg=
ing
> into my Zope-2_6-branch sandbox suddenly loads of merges are done and
> ultimately it fails with a permission error! Yes, I did update the sand=
box
> before I merged.
>
> What the f....???
>
>
> I hate CVS. It sucks.

CVS doesnt like throwing away changes you have made locally. Most of the =
time=20
this is a good thing, but it causes problems when you want a clean copy o=
f a=20
branch to merge stuff into.

To get a clean copy of your current branch:

cvs update -C

(possibly add -d -P in there too to create and delete directories)