FreeBSD CVS for DOS/Windows sources?

2003-12-21 Thread Doug Lee
I'm trying to use FreeBSD's CVS (v1.11.5) to manage DOS/Windows
projects, which of course means files with CR/LF line endings.  The
docs claim the repository will internally store everything (text files
anyway) with only LF endings, but in fact I'm seeing CR/LF endings in
repository text files.  This is still fine until I pull a project out
with a DOS/Windows CVS client (the standard cvs.exe), which gives me
lines ending in CR/CR/LF.  If I pull the project under Unix, I get the
CR/LF endings just fine; but my coworkers will not be telneting to
Unix just to pull code...

I'm considering CVSNT because it's made to handle things like this,
but I don't really want to hand the whole source management thing over
to a Windows box and don't fancy running two different CVS packages on
one FreeBSD box either.  (Also, I'm not sure how stable CVSNT is now.)

Recommendations welcome.  I'm not sure I'm asking this in the best
place, but I know a lot of people here use CVS, and particularly the
one that comes with FreeBSD.  (I run FreeBSD 4-STABLE in case it
matters.)

Thanks much.


-- 
Doug Lee   [EMAIL PROTECTED]http://www.dlee.org
Bartimaeus Group   [EMAIL PROTECTED]   http://www.bartsite.com
Snowmen fall from heaven, unassembled.
--anon
___
[EMAIL PROTECTED] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to [EMAIL PROTECTED]


Re: FreeBSD CVS for DOS/Windows sources?

2003-12-21 Thread Daniela
On Sunday 21 December 2003 17:25, Doug Lee wrote:
 I'm trying to use FreeBSD's CVS (v1.11.5) to manage DOS/Windows
 projects, which of course means files with CR/LF line endings.  The
 docs claim the repository will internally store everything (text files
 anyway) with only LF endings, but in fact I'm seeing CR/LF endings in
 repository text files.  This is still fine until I pull a project out
 with a DOS/Windows CVS client (the standard cvs.exe), which gives me
 lines ending in CR/CR/LF.  If I pull the project under Unix, I get the
 CR/LF endings just fine; but my coworkers will not be telneting to
 Unix just to pull code...

I don't know anything about Micro$oft Winblows eXPensive, but why don't you 
just strip the CR on the server? So the Windoze client can add the CR, and 
you always get the native format, respectively.
This is definitely the fault of the client, so don't blame the server :-)

Regards,
Daniela


___
[EMAIL PROTECTED] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to [EMAIL PROTECTED]


Re: FreeBSD CVS for DOS/Windows sources?

2003-12-21 Thread Doug Lee
On Sun, Dec 21, 2003 at 08:58:30PM +, Daniela wrote:
 On Sunday 21 December 2003 17:25, Doug Lee wrote:
  I'm trying to use FreeBSD's CVS (v1.11.5) to manage DOS/Windows
  projects, which of course means files with CR/LF line endings.  The
  docs claim the repository will internally store everything (text files
  anyway) with only LF endings, but in fact I'm seeing CR/LF endings in
  repository text files.  This is still fine until I pull a project out
  with a DOS/Windows CVS client (the standard cvs.exe), which gives me
  lines ending in CR/CR/LF.  If I pull the project under Unix, I get the
  CR/LF endings just fine; but my coworkers will not be telneting to
  Unix just to pull code...
 
 I don't know anything about Micro$oft Winblows eXPensive, but why don't you 
 just strip the CR on the server? So the Windoze client can add the CR, and 
 you always get the native format, respectively.
 This is definitely the fault of the client, so don't blame the server :-)

Actually I wasn't sure whose fault it was, since the docs say the
CR's should not be stored by the server.  Given that, the client did
what it should under the circumstances.

Maybe a later CVS version than 1.11.5 fixes this in the server?  I'm
not sure.

I didn't edit the repo because I don't consider myself savvy enough
about CVS yet to start playing with repo files directly, except to
look at them with a curious eye.

-- 
Doug Lee   [EMAIL PROTECTED]http://www.dlee.org
Bartimaeus Group   [EMAIL PROTECTED]   http://www.bartsite.com
Is your cucumber bitter? Throw it away. Are there briars in your
path? Turn aside. That is enough. Do not go on to say, `Why were
things of this sort ever brought into the world?'
--Marcus Aurelius
___
[EMAIL PROTECTED] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to [EMAIL PROTECTED]


Re: FreeBSD CVS for DOS/Windows sources?

2003-12-21 Thread Jan Grant
On Sun, 21 Dec 2003, Doug Lee wrote:

 On Sun, Dec 21, 2003 at 08:58:30PM +, Daniela wrote:
  On Sunday 21 December 2003 17:25, Doug Lee wrote:
   I'm trying to use FreeBSD's CVS (v1.11.5) to manage DOS/Windows
   projects, which of course means files with CR/LF line endings.  The
   docs claim the repository will internally store everything (text files
   anyway) with only LF endings, but in fact I'm seeing CR/LF endings in
   repository text files.  This is still fine until I pull a project out
   with a DOS/Windows CVS client (the standard cvs.exe), which gives me
   lines ending in CR/CR/LF.  If I pull the project under Unix, I get the
   CR/LF endings just fine; but my coworkers will not be telneting to
   Unix just to pull code...
 
  I don't know anything about Micro$oft Winblows eXPensive, but why don't you
  just strip the CR on the server? So the Windoze client can add the CR, and
  you always get the native format, respectively.
  This is definitely the fault of the client, so don't blame the server :-)

 Actually I wasn't sure whose fault it was, since the docs say the
 CR's should not be stored by the server.  Given that, the client did
 what it should under the circumstances.

If the file is stored in text mode, the _client_ does line-ending
conversions according to local conventions. The server expects the files
to be in the unix \n-terminated format.

So the problem is actually the fault of the unix client since it
knows that it doesn't need to do any CRLF translation on upload.

You see this a lot when using Unix CVS to deal with windows-originated
files. Your options are either to do the first import using a windows
cvs client, or to correct the line ends (eg, with dos2unix) on the unix
cvs client prior to upload.

Once the files are correctly formatted on the server, both unix and
windows clients will be able to deal with them correctly.

 I didn't edit the repo because I don't consider myself savvy enough
 about CVS yet to start playing with repo files directly, except to
 look at them with a curious eye.

For text files, they're line-oriented. The server itself will not insert
any '\r' characters, so any that are in your repo files definitely came
from a borked upload. You should be able to strip them out and
re-checkout the files: diffs will be unaffected.


-- 
jan grant, ILRT, University of Bristol. http://www.ilrt.bris.ac.uk/
Tel +44(0)117 9287088 Fax +44 (0)117 9287112 http://ioctl.org/jan/
There's no convincing English-language argument that this sentence is true.
___
[EMAIL PROTECTED] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to [EMAIL PROTECTED]