Sign in Join

Live chat for Free Pascal, Lazarus, Delphi and every Pascal programmer.

Mailing lists / lazarus / 2000-02

CVS error

6 messages · 4 people ·

Reply by email Subscribe to this list Your subscription

Read-only archive. Use j and k to move between messages.

Michael Van Canneyt
to Hongli Lai: Op Tue, 29 Feb 2000, schreef Michael Van Canneyt: My cvs doesn't recognize the -dP option.
Hongli Lai wrote 8 lines
Op Tue, 29 Feb 2000, schreef Michael Van Canneyt: > On Tue, 29 Feb 2000, Hongli Lai wrote: > > Try adding -dP to your cvs update options. > if that doesn't work, remove the entry -with cfg in the file > rtl/CVS/Entries My cvs doesn't recognize the -dP option.

It should. Make sure it is AFTER the 'update' keyword.

Michael.

Reply by email

Hongli Lai

There's a CVS error. When I try to update the sources from CVS it gives me this message:

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

This is the content of my cvs_update script:
#! /bin/sh
cvs -z3 -d update base rtl ide compiler utils packages lazarus gdbpas fcl

When I do a
cvs -z3 -d 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?

Reply by email

Peter Vreman
to Michael Van Canneyt: Try adding -dP to your cvs update options. if that doesn't work, remove the entry -with…
you wrote 10 lines
Op Tue, 29 Feb 2000, schreef Michael Van Canneyt: > On Tue, 29 Feb 2000, Hongli Lai wrote: > > Try adding -dP to your cvs update options. > if that doesn't work, remove the entry -with cfg in the file > rtl/CVS/Entries My cvs doesn't recognize the -dP option. I'm using cvs 1.10.6. The directory rtl/cfg already exists at my computer.

Just remove the directory, it's obsolete.

Peter

Reply by email

Hongli Lai
to Michael Van Canneyt: Try adding -dP to your cvs update options. if that doesn't work, remove the entry -with…

Op Tue, 29 Feb 2000, schreef Michael Van Canneyt:

Show quoted text 5 lines
On Tue, 29 Feb 2000, Hongli Lai wrote: Try adding -dP to your cvs update options. if that doesn't work, remove the entry -with cfg in the file rtl/CVS/Entries

My cvs doesn't recognize the -dP option.
I'm using cvs 1.10.6.
The directory rtl/cfg already exists at my computer.

Reply by email

Michael Van Canneyt
to Hongli Lai: There's a CVS error. When I try to update the sources from CVS it gives me this message:…
Hongli Lai wrote 16 lines
There's a CVS error. When I try to update the sources from CVS it gives me this message: 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

Show quoted text 11 lines
This is the content of my cvs_update script: #! /bin/sh cvs -z3 -d update base rtl ide compiler utils packages lazarus gdbpas fcl When I do a cvs -z3 -d 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.

Reply by email