You could compile cvs for Cygwin - its Unix-like environment doesn't
put \r into text files. (You may need to set your Cygwin filesystem
as 'binary' - I don't know if that still applies.)
But the simplest way is probably to check out as normal and then run
the files through dos2unix or a Perl
I think the problem is the start and end points of your merge.
If I have a trunk, and I created a branch from that trunk, tagging it at
the point it was created, I would use the following to merge the branch
back into the trunk:
-j branch_CREATED -j branch
Often this can simply be abbreviated
Jim writes:
That's an assumption about the file that is incorrect... it didn't start
with \r's in it... and I need them to not be there.
Then it's not a text file, by definition, no matter how much you think
it is.
-Larry Jones
Hello, local Navy recruitment office? Yes, this is an
Jim writes:
How can I check out a file on Linux with \r's ?
By checking it in on Linux with \r's. Either the \r's are part of the
line separator or they're part of the data -- you can't have it both
ways.
As part of a build process I use a SHA1 of the source as part of the
versioning
On Mon, 2003-11-10 at 16:13, Wim Bertels wrote:
Houdi,
is there a good way to obtain (/report) user statistics, (these user
are cvs users),
like for example:
alfred worked for 56% on project1,
joe worked for 14% on project1,
mark worked for 45% on project2,
You can get some stats and
Okay - under Linux, 'how do I checkout WITH \r's?' that's easy - put em in
the file, check it in, and check it out... but woe to the windows user - who
now get's \r\r\n's.
under windows, how to do the same? Well if I have complete control over all
options, use cygwin CVS and UNIX style file
Concurrent Versions System (CVS) 1.12.2
(client)
When I do a CVS commit of a changed file (for
example this morning)
the timestmp of the last mod was :
8:31
after the commit the timestamp on the file was
1:09
(hmm seems my clock on my CVS server is off also...
since at 8:32 it thought
Dear All:
I have winCVS 1.13 installed locally on my machine.
For authentication I am using Local settings. I
have created a repository on network mapped drive
called R:\cvsrepos. That's where my CVSROOT is
defined.
Now, it seems that I can import a populated direcorty
into my CVSROOT
wincvs has an option to check files out with *NIX line terminators. Maybe
this will do what you want.
But really that is not the point. Inherent in the idea of a text file is
that you should be able to edit it. The convention is that *NIX and DOS
terminate the line endings differently on a
On Tue, 11 Nov 2003 20:40:59 -0800, Jim wrote
How can I check out a file on Linux with \r's ?
As part of a build process I use a SHA1 of the source as part of the
versioning information. The same code on both windows and linux should
generate the same SHA1.
You need to normalize your text
Bryce Nesbitt (spam account) writes:
/usr/bin/cvs -lf -Qd /tmp/cvsroot_test co -p -r1.2 module/file.zip
Is slow because of the pipe.
Since when are pipes slow?!? That is the way to do what you want.
-Larry Jones
I wonder if you can refuse to inherit the world. -- Calvin
If I'm not mistaken, the CVS server operates in UTC, not local time. Given
the time zone settings on your CVS server, does that look right to you?
Jim said:
Concurrent Versions System (CVS) 1.12.2 (client)
When I do a CVS commit of a changed file (for example this morning) the
timestmp of
Jim writes:
If one is developing and working with both platforms, his tools better be
able to work with each other's TEXT without difficulty.
No, you just need to learn to use the tools on the platform they were
intended for instead of pretending that the two platforms are
interchangeable.
Geoff Beier writes:
You could of course also use the cygwin client on Windows and configure it to
use text files with UNIX line endings. This was the default at one time.
It's also an extraordinarily bad idea. Trying to pretend that the
native text file format is something other than what it
13.3 Reverting to the latest vendor release
You can also revert local changes completely and return to the latest vendor release
by changing the `head' revision back to the vendor branch on all files. For example,
if you have a checked-out copy of the sources in `~/work.d/wdiff', and you want
15 matches
Mail list logo
