- 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 to by
> removing,adding and then committing
> 2) merge branch B into HEAD
At
Hi
I am getting the following CVS lock error.
One developer tried CVS update and got the error
"cvs update aborted fatal signal 11 sent
cvs locks may need cleaning up"
at the file
/$CVSROOT/src/images/fforward.bmp
Then she tried the update several times before
informing me.
When I saw in that
Marc Berenbach writes:
>
> Basically, is there a way for CVS to detect this, and what settings
> would we need to change in WinCVS to make this possible... I am working
> with revision 1.4 on my machine, the one on the server is 1.6, and I
> choose to commit... I want it to stop right there and
DAve Goodrich writes:
>
> Hello all. I'm running into a problem with clients that send files to the
> repository with Mac or Win file endings.
What clients are these? It is the client's responsibility to convert
text files from whatever the local line ending convention is to the
canonical line-
Stephen Morley writes:
>
> I'm installing cvs on a new server and want to start using pserver. I'm
> getting the following error when I try to use any cvs command:
> ~/test
> [13:34:47]$cvs checkout shared-tcl
> cannot create_adm_p /tmp/cvs-serv25355/shared-tcl
> Permission denied
[...]
> I have
Russ Tremain writes:
>
> you can use -D with -r , but sometimes it is confusing.
> if is a simple tag, and not a branch tag, you might
> not get what you expect.
If you specify both a specific revision and a specific date, I don't see
how you would know *what* to expect.
-Larry Jones
In short
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 branch,
>
Hi everyone,
I am new to CVS, but not versioning control... I have used PVCS and
SourceSafe in the past few years. I am now the owner of a CVS system,
and I have a question...
Is there a way that I can force developers to review a change using
visual differencing if a file has been changed from
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 to by
removing,adding and then committing
2) merge branch B into HEAD
Next I am planning to merge branch A into HEAD. But the filename in A is
still "old.t
[EMAIL PROTECTED] on 2001.04.12 14:34:33
>> "Mike" == Mike Castle <[EMAIL PROTECTED]> writes:
>
> Mike> On Wed, Apr 11, 2001 at 06:06:22PM -0700, Paul Sander wrote:
> >> - If a branch is merged multiple times to an ancestor, don't count
> >> the result of the prior merge as a conflict. (R
> "Mike" == Mike Castle <[EMAIL PROTECTED]> writes:
Mike> On Wed, Apr 11, 2001 at 06:06:22PM -0700, Paul Sander wrote:
>> - If a branch is merged multiple times to an ancestor, don't count
>> the result of the prior merge as a conflict. (Remember, CVS
>> performs a
Mike> As I said in a
Hello all. I'm running into a problem with clients that send files to the
repository with Mac or Win file endings. Not a problem I thought, opened
cvswrappers and added
*.inc -t 'mac2unix.pl %s'
*.class -t 'mac2unix.pl %s'
*.html -t 'mac2unix.pl %s'
*.php -t 'mac2unix.pl %s'
*.inc -t 'win2unix.pl
Something like:
^cyclic-pages ( date /t & more & start /dU:\www\local-docs cmd /c cvs -q
update -d )
Jerry
Re:
>From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
>Sent: Thursday, April 12, 2001 10:20 AM
>the background. Here is an example for unix (this should all be on one
>line):
>^cyclic-
I'm installing cvs on a new server and want to start using pserver. I'm
getting the following error when I try to use any cvs command:
~/test
[13:34:47]$cvs checkout shared-tcl
cannot create_adm_p /tmp/cvs-serv25355/shared-tcl
Permission denied
The entry in the inetd.conf is
cvspserver stream tcp
[EMAIL PROTECTED] on 2001.04.12 13:31:41
>On Thu, Apr 12, 2001 at 11:29:59AM -0400, Noel L Yap wrote:
>> [EMAIL PROTECTED] on 2001.04.12 11:14:55
>> >I thought we were talking about a generic tool that would do a merge for
>> >any arbitrary file and save it to disk. What needs to use CVS/Entr
On Thu, Apr 12, 2001 at 11:29:59AM -0400, Noel L Yap wrote:
> [EMAIL PROTECTED] on 2001.04.12 11:14:55
> >I thought we were talking about a generic tool that would do a merge for
> >any arbitrary file and save it to disk. What needs to use CVS/Entries?
>
> Should CVS be told about the merge?
Ah
The CVS manual speaketh thusly:
"C.7.2 Keeping a checked out copy
"It is often useful to maintain a directory tree which contains files
which correspond to the latest version in the repository. For example,
other developers
might want to refer to the latest sources without having to check them
o
It would not be necessary for the merge tool itself to muck around with
CVS metadata. Just have CVS do that and invoke an external tool to perform
the actual work of the merge.
--- Forwarded mail from [EMAIL PROTECTED]
[EMAIL PROTECTED] on 2001.04.11 21:31:01
>On Wed, Apr 11, 2001 at 06:06:22PM
you can use -D with -r , but sometimes it is confusing.
if is a simple tag, and not a branch tag, you might
not get what you expect.
-Russ
At 10:56 PM -0700 4/11/01, David L. Martin wrote:
>> David L. Martin writes:
>> >
>> > I'd like to be able to checkout from a branch but take revisions tha
FORTINI Massimiliano writes:
>
> When I deleted a file from CVS repository with Remove Selection and then
> Commit, Cvs created a subdirectory called Attic where he maintained the file
> deleted.
> What's he behavioral?
CVS moves the file into the Attic so it doesn't need to even look at it
for
Sudarshan writes:
>
> I have created a repository in /projects with module testproj1.
>
> I have created another repository in /projects/project1 with one module
> projarun.
>
> Now i want to move the module testporj1 into second repository with all
> the versions of file which was similar as
I recently did a `cvs import' to update the version of a third-party
package that we use in our product.
Unfortunately, this import immediately broke our repository;
the automated cron tests started failing, developers on the
other side of the planet complained because they couldn't build
from CV
CVS maintains deleted files so that it can recreate your development tree
based on any previous revision, tag, branch, or date. If files were REALLY
deleted, it would be impossible for CVS to re-create earlier versions of
those files if you needed them.
- Dennis
- Original Message -
Fro
[EMAIL PROTECTED] on 2001.04.12 11:14:55
>On Thu, Apr 12, 2001 at 11:05:51AM -0400, Noel L Yap wrote:
>> If a wrapper tool were used, it would necessarily have to munge around the
>> CVS/Entries file which is supposed to be internal to CVS (eg its
implementation
>> could change or it could dis
On Thu, Apr 12, 2001 at 11:05:51AM -0400, Noel L Yap wrote:
> If a wrapper tool were used, it would necessarily have to munge around the
> CVS/Entries file which is supposed to be internal to CVS (eg its implementation
> could change or it could disappear altogether in the future).
Huh?
I though
[EMAIL PROTECTED] on 2001.04.11 21:31:01
>On Wed, Apr 11, 2001 at 06:06:22PM -0700, Paul Sander wrote:
>> - Invoke a type-specific merge tool, ideally one of the user's choice.
>
>Actually, simply "an external tool. Period" would be sufficient. Then
>said external tool can have whatever inte
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
Attached is a patch which fixes a bug in the Windows command line
version of CVS allowing Windows users to do cvs checkout .
The patch was developed against 1.10.5 but still applies cleanly to
1.11.
Any chance of this patch making it into the main tree?
Mike
filesubr.patch
Good morning,
Hi, I'm a long time independent contractor and a 'newbie' to WinCvs and CVS.
I've used many version control systems including SCCS, PVCS, Source Safe and
a variety of Customer created systems. My last Customer, at the insistance
of their Development Staff, replaced Source Safe with
I have created a repository in /projects with module testproj1.
I have created another repository in /projects/project1 with one module
projarun.
Now i want to move the module testporj1 into second repository with all
the versions of file which was similar as it was in previously. how
should i
Hi,
my name's Massimiliano.
I have a question.
When I deleted a file from CVS repository with Remove Selection and then
Commit, Cvs created a subdirectory called Attic where he maintained the file
deleted.
What's he behavioral?
Thankx in advance
Massimiliano Fortini
E
Hi,
I have a question, there's a folder that consists some files and some sub folders in
CVS server under linux. But some of files and sub folders in the Main Folder deleted
manually accidently. But the source still available in my local drive. From Win CVS
client i saw the sub folders and thos
On Wed, 11 Apr 2001 [EMAIL PROTECTED] wrote:
> There are obviously some areas where CVS can be improved - no doubt.
> But if you compare it to some other commercial SCM system that I'm
> familiar with, e.g. ENVY that comes with IBM's Visual Age for Java or
> PVCS, it is much, much superior. If Cl
hi chuck, hi anyone,
i think my problem is caused by different timestamps, but i don't know a
solution by now.
after reading your mail (chuck) i compared both the two computers. my
cvs-server "lives" in timezone gmt+1 (germany...) and its actual time then
was 09:25:00. my wincvs-client also is in
--- Forwarded mail from [EMAIL PROTECTED]
>On Wed, Apr 11, 2001 at 06:06:22PM -0700, Paul Sander wrote:
>> - If a branch is merged multiple times to an ancestor, don't count the
>> result of the prior merge as a conflict. (Remember, CVS performs a
>As I said in an earlier post, this can be sc
--- Forwarded mail from [EMAIL PROTECTED]
>On Wed, Apr 11, 2001 at 05:21:26PM -0700, Paul Sander wrote:
>> - The *info files accept a comprehensive list of sources on their command
>> lines, limiting their scalability. (After a branch merge on a very large
>> project, the command line buffe
36 matches
Mail list logo
