Fergus Henderson writes:
The reason that this broke things is that `cvs checkout'
was checking out inconsistent versions of different files.
After the import, some files -- those which we had not modified -- now
had revision 1.1.2 on the vendor branch, and only 1.1 on the main
I would first *copy* all of your working area containing
the repository-deleted files to a backup area.
Next, I'd suggest using import - select the directory in
your working area containing the repository-deleted
files and set the path on the remote server as the
start of the deleted repository
- Original Message -
From: "Chen, Susie" [EMAIL PROTECTED]
I have two branches (A and B) off the HEAD. Both branches have a file
"old.txt". What I have done is:
1) On branch B, rename the file from old.txt to new.txt by
removing,adding and then committing
2) merge branch B into
Chuck,
The patch I submitted for incorporation to WinCVS should
show up in the next release (1.2.1 perhaps). The specific
issue addressed was the difference in date/time
stamp for days of the month from the first through the
nineth for Unix/cygwin versus Visual C++ (WinCVS). The
bug should
David L. Martin writes:
I'd like to be able to checkout from a branch but take revisions that
are older than a specified date. Since the -D and -r are both
sticky, they apparently cannot be used in combination. Does
anyone know of a workaround or combination of commands to
do
Chris,
Yes (if you're referring to PVCS Version Manager). I've done this for 4 projects,
about 10,000 archives in total.
You can find a readme_pvcs2cvs.txt and pvcs2cvs.pl script by following
the links to the Download section starting from:
http://www.scm-professionals.com
The pvcs2cvs.pl
I'd like to be able to checkout from a branch but take revisions that
are older than a specified date. Since the -D and -r are both
sticky, they apparently cannot be used in combination. Does
anyone know of a workaround or combination of commands to
do this?
Also, does the -D option only apply
o: David L. Martin; info-cvs
Subject: Re: MS Visual C++ daylight saving time bug
David and All,
For WinCvs, we use Visual C++ 6.0 SP 4 and we called tzset. I
didn't get any
problem but I'm not using cvsnt.
Regards,
alex.
- Original Message -
From
From: David L. Martin [mailto:[EMAIL PROTECTED]]
Commented out from the script is an alternative
"automatic" way to determine whether the file
is ASCII using the Unix file command.
From: Jerry Nairn
A better way of doing this is with "cvs -n log -h". On
WinCVS version 1.2 is incorrectly reporting that cvs controlled files
are locally modified. Interesting it only does this for some files and
not others. To check out files, I'm using the version of cvs.exe that
comes with cygwin (version 1.11). Any help is greatly appreciated.
Thanks
From: "Laine Stump" [EMAIL PROTECTED]
Files go into the Attic when they don't exist on the trunk. If a file
is added on a branch, it doesn't exist on the trunk, so the ,v file
goes in the Attic. When you want to merge your work into the trunk,
you'll need to add those new files on the trunk,
Mark,
- Original Message -
From: "Mark O'Brien" [EMAIL PROTECTED]
Okay, here's what I would like to do.
Short: Create and automated baseline/build/package system, that executes
after being given bugs that have been fixed.
...
1) Need to have CVS ask for bug number prior to
- Original Message -
From: "Richard Cobbe" [EMAIL PROTECTED]
What's the CVSREAD variable for?
I know what it does, but I was (and remain) hard-pressed to come up with a
situation in which this behavior would be useful. I'm assuming that such
situations exist; could someone
- Original Message -
From: "David L. Martin" [EMAIL PROTECTED]
I think it is the responsibility of the CVS administrator to proclaim a
standard, canonical end-of-line format for ASCII files (either Unix
LF, Windows LF-CR, or even Mac LF), and enforce it to keep the
[EMAIL PROTECTED] (Larry Jones) writes:
[EMAIL PROTECTED] writes:
I found out recently that when we check out some code that was only
recently placed in the repository that it has extra spaces between
the lines that weren't there before. Could it be that something was
done
From: "Greg A. Woods" [EMAIL PROTECTED]
[ On Thursday, December 21, 2000 at 00:22:41 (-0600), David L. Martin wrote: ]
Subject: Proposal to fix CVS binary file implementation
"Proposal to improve CVS binary file implementation" would probably
have been a better title.
From: "Paul Sander"
I agree in principle with your statements and your proposal, but I observe
two omissions:
1. There is a class of text file that is not mergeable, but requires
newline
conversion. CVS does not currently support that class of file, but I
believe it should. Supporting
"Derek R. Price" wrote:
Unfortunately, if, say, somebody wrote some C code like the following:
foo_c_date = "$Date: somedate$"
as used to be a common practice, then -kk causes shortening of the data
segment of
a binary so that "$Date: somedate$" becoming "$Date$" throws off all
sorts
CVS'ers,
A binary file is a binary file. Period. It can
contain any sequence of characters, the encoding and interpretation of which is
solely understood by the application that created it. CVS should do
nothing in terms of keyword expansion or End Of Line conversion to modify a
binary
Ross,
How can we stop WinCVS/cvs/whatever is
to blame from converting text files, so that the Windows machine has
Unix-style files on?
Recent WinCVS versions (at least since1.1b8) have the option in
AdminPreferences Global tab of checking out ASCII files with Unix LF.
Check this box. Be
Try setting the environment variable $HOME=C:
David
When I try to login to the CVS server from a Windows 98
machine, I get the error message,
(Logging in to djones@cvshost)
CVS.EXE [login aborted]: could not find out home
directory
Here's the command I've been
Antonio,
MKS is a decent tool for file-based version control. It does offer some
features beyond what CVS including:
1) Security policy using their Security and Administration Module (SAM) on
a per-project and/or per-user basis
2) *Automatic* file type detection (ASCII vs Binary)
3) Option
"Louis-David Mitterrand" wrote:
Performing:
% cvs -d [EMAIL PROTECTED]:/var/cvs update
works fine, but when doing:
% cvs update
then I get tons of:
C Item/Toys_and_Games/Wind_Up/index.md
cvs update: move away Item/Travel_and_Transportation/ah.mc; it is in the
way
C
Greetings,
I'm using WinCVS 1.1b13 on NT in pserver mode against a
Solaris 2.6 server running cvs 1.10.8. I have a checkout area in which I
only perform "cvs update -Pd" (no editing is done in this area).
Occasionally for some directories I get the following error for each file in the
Laine,
Speaking of converting to CVS from other systems - has anyone ever
converted a Visual SourceSafe repo into CVS? If so, do you have a script
laying around? I've convinced "the powers" that we need to switch from
VSS to CVS, but we've got several years worth of VSS history and I'd
much
Hello,
I need some advice on how to best perform a merge in the scenario
below. This mimics a real-world example that was just performed, and I
would welcome pointers on how to improve the process.
We're using the trunk for work on the next product release, and branches
are created for
...snip
Unfortunately, I still do want to have users get exclusive use of
files when they check something out. Lots of binary files (gifs, jpgs,
mpgs) will be in use, but worse than that -- in my organization there
are liable to be multiple people working on the same file in the same
place at the
e.
Nestor
-Original Message-----
From: David L. Martin [mailto:[EMAIL PROTECTED]]
Sent: Tuesday, May 30, 2000 10:23 AM
To: [EMAIL PROTECTED]
Subject: Need Merging Advice
Hello,
I need some advice on how to best perform a merge in the scenario
below. This mimics a real-world example tha
Jesper,
During the move from my MKS/SI repository to
CVS I found this thing:
In src/rcs.c line 4068 (CVS-1.10.8) there is a
strncmp which fails, due to 'log' is NULL.
I added a check for log != NULL and the program
run fine again.
Is this a bug or has something in the conversion
gone wrong ?
Jesper,
Hi.
I'm about to move a RCS repository made
by MKS Source Integrity 7.3e (Windows version)
to CVS.
Does anybody have experience in doing so ?
I've made a small test based on the information
located on page 28 in the CVS manual, but doesn't
seem to be enough. I get alot of:
We also have an environment in which Unix home directories are accessed via
Samba on NT, which is our platform for development. We use WinCVS 1.1b11 on
NT with global Preferences set to checkout ASCII files with Unix LF
termination (which applies to both checked out files and to CVS
In my opinion the -kk option shouldn't override the
-kb option.
Wilfried
I agree. It's a shame that keywords and merging don't get along and that
the binary designation has been overloaded with keyword expansion state.
I'd like to see a new -kkb option, perhaps, which disables keyword
Hello Davin,
Can someone please tell me where I can find the PVCS to RCS conversion
script. The documentation states that you can find the script in the
contrib directory of the sounds, bit its not there. I searched the
Internet for this script with no luck
The pvcs_to_rcs script was removed
Note that main.c DOES NOT get tagged. Even if you 'cvs tag -F some_tag
main.c'
it does not get tagged. You can ONLY tag the new (dead) revision, via
'cvs tag -r 1.2 main.c', which is cumbersome, because not all files in a
source
tree are on the same revision. You can also do 'cvs tag -r HEAD
34 matches
Mail list logo
