On 10/27/05, segv@netctl.net <segv@netctl.net> wrote:
> On Wed, 26 Oct 2005 22:59:03 +0200
> Roland Illig <rillig@NetBSD.org> wrote:
>
> > The "<<<<<<" almost always means that you have a CVS conflict. Run "cvs
> > update" and watch the lines starting with "C ". Then fix these files.
> >
> > Roland
>
> What does that mean??

You edited those files locally and newer changes in the repository conflict=
ed
with them.

> Do I have to upgrade my cvs utilities or simply removing
> pkgsrc tree and doing a fresh checkout will fix it?

Just remove the affected files or run a 'cvs update -C', which will clear _=
all_
your local modifications.

--
Julio M. Merino Vidal <jmmv84@gmail.com>
The Julipedia - http://julipedia.blogspot.com/
The NetBSD Project - http://www.NetBSD.org/