Re: error in CVS

[Mojca M. <moj...@gm...>]

On Fri, Apr 27, 2012 at 14:48,  <pl...@pi...> wrote:
> Hi,
>
> just updated from cvs and it fails to compile version.h
>
> looks like a patching error:
>
>
> const char gnuplot_version[] = "4.7";
> const char gnuplot_patchlevel[] = "0";
> <<<<<<< version.c
> const char gnuplot_date[] = "2012-02-08 ";
> const char gnuplot_copyright[] = "Copyright (C) 1986-1993, 1998, 2004,
> 2007-2011";
> =======
> const char gnuplot_date[] = "2012-03-02 ";
> const char gnuplot_copyright[] = "Copyright (C) 1986-1993, 1998, 2004,
> 2007-2012";
>  >>>>>>> 1.104

My guess is that while you were building gnuplot your local copy was
changed. In the meantime it was also changed in CVS and when you tried
to update, CVS had problems with merging the changes (it wasn't able
to decide whether to obey your local modifications or to take the one
from CVS).

It probably helps to simply delete this file and update again.

Mojca