[lazarus] CVS error

[Michael Van Canneyt]

On Tue, 29 Feb 2000, Hongli Lai wrote:

> There's a CVS error. When I try to update the sources from CVS it gives me this
> message:
> 
> [hongli at ns fpc]$ ./cvs_update
> ? compiler/ppc1
> ? compiler/ppc2
> ? compiler/ppc3
> ? lazarus/components/mwedit/fpcmade.lnx
> ? lazarus/lcl/fpcmade.lnx
> ? lazarus/lcl/link.res
> cvs server: Updating base
> cvs server: Updating rtl
> cvs server: Updating rtl/amiga
> cvs server: Updating rtl/atari
> cvs server: Updating rtl/cfg
> cvs [server aborted]: cannot open directory /FPC/CVS/fpc/rtl/cfg: No such file or directory

Try adding -dP to your cvs update options.
if that doesn't work, remove the entry -with cfg in the file
rtl/CVS/Entries

> 
> This is the content of my cvs_update script:
> #! /bin/sh
>  cvs -z3 -d :pserver:cvs at cvs.freepascal.org:/FPC/CVS update base rtl ide compiler utils packages lazarus gdbpas fcl
> 
> When I do a
> cvs -z3 -d :pserver:cvs at cvs.freepascal.org:/FPC/CVS update lazarus
> it works.
> But when CVS is finished, and I look into clipbrd.pp and clipbrd.inc, I saw
> that the sources of the old TClipboard and the new TClipboard are mixed.
> Is this a CVS error?

No, this is normal. If someone has changed TClipboard while you were working on
it, his changes are merged into yours.

Michael.