Please Help with cvs co -pr

2004-11-15 Thread John Elgin
Can somebody please try the following on 1.11.17 or 1.11.18 and let me know
the results?

cvs rtag testtag CVSROOT/modules
cvs co -pr testtag CVSROOT/modules

Thanks,
John C. Elgin


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/info-cvs


Re: Please Help with cvs co -pr

2004-11-15 Thread Mark D. Baushke
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

John Elgin [EMAIL PROTECTED] writes:

 Can somebody please try the following on 1.11.17 or 1.11.18 and let me know
 the results?

Both 1.11.17 and 1.11.18 fail, so this is a bug that needs to be fixed
and a test case that needs to be added to sanity.sh before 1.11.19 may
be released.

Note CVS on FEATURE (1.12.9.1) works. This is soon to be released as cvs
1.12.10.

 cvs rtag testtag CVSROOT/modules
 cvs co -pr testtag CVSROOT/modules

-- Mark

% rm -rf /tmp/testcvsroot
% cvs -d :fork:/tmp/testcvsroot init
% cvs -d :fork:/tmp/testcvsroot version
Client: Concurrent Versions System (CVS) 1.11.18 (client/server)
Server: Concurrent Versions System (CVS) 1.11.18 (client/server)
% cvs -d :fork:/tmp/testcvsroot rtag testtag CVSROOT/modules
% cvs -d :fork:/tmp/testcvsroot co -pr testtag CVSROOT/modules
assertion repository != NULL failed: file recurse.c, line 667
cvs [checkout aborted]: received abort signal
% 


% rm -rf /tmp/testcvsroot
% cvs -d :fork:/tmp/testcvsroot init
% cvs -d :fork:/tmp/testcvsroot version
Client: Concurrent Versions System (CVS) 1.12.9.1 (client/server)
Server: Concurrent Versions System (CVS) 1.12.9.1 (client/server)
% cvs -d :fork:/tmp/testcvsroot rtag testtag CVSROOT/modules
% cvs -d :fork:/tmp/testcvsroot co -pr testtag CVSROOT/modules
===
Checking out CVSROOT/modules
RCS:  /tmp/testcvsroot/CVSROOT/modules,v
VERS: 1.1
***
# Three different line formats are valid:
#   key -aaliases...
#   key [options] directory
#   key [options] directory files...
#
# Where options are composed of:
#   -i prog Run prog on cvs commit from top-level of module.
#   -o prog Run prog on cvs checkout of module.
#   -e prog Run prog on cvs export of module.
#   -t prog Run prog on cvs rtag of module.
#   -u prog Run prog on cvs update of module.
#   -d dir  Place module in directory dir instead of module name.
#   -l  Top-level directory only -- do not recurse.
#
# NOTE:  If you change any of the Run options above, you'll have to
# release and re-checkout any working directories of these modules.
#
# And directory is a path to a directory relative to $CVSROOT.
#
# The -a option specifies an alias.  An alias is interpreted as if
# everything on the right of the -a had been typed on the command line.
#
# You can encode a module within a module by using the special ''
# character to interpose another module into the current module.  This
# can be useful for creating a module that consists of many directories
# spread out over the entire source repository.
% 
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.2.3 (FreeBSD)

iD8DBQFBmSxJ3x41pRYZE/gRAqi1AJ9lNLGvD+PlkzamSJm9ZyUgqhTjzACgsGNz
RKOvcd8P5ScTYZQZ5AcSVUQ=
=ZRtJ
-END PGP SIGNATURE-


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/info-cvs


RE: Please help troubleshooting connection problem via SSH

2004-11-11 Thread George Dinwiddie
Chris,

I do not believe this is an ssh issue.  I believe it's a WinXP SP2 issue with 
CvsNT (which both WinCVS and TortoiseCVS seem to use).  I'm having a similar 
problem with these as well as with the Eclipse CVS client (which seems to be 
written in Java).

The production server is CVS version 1.11.17 and I can connect with it via SSH 
using the Cygwin CVS client (also version 1.11.17).  I cannot connect with it 
via SSH using CVSNT version 2.0.58d.

The SSH connection works fine, but the CVS client hangs.  In order to see what 
was happening on the server side, I experimented with an old CVS (version 1.11) 
setup I already had on a private machine.  I did some grepping and found 
reference to a CVS_SERVER_LOG environment variable, but that doesn't seem to be 
used any more.  It's not mentioned in the latest copy of the CVS manual and it 
doesn't seem to work.

I renamed my cvs executable to cvs-bin and wrote this shell script for cvs:

#!/bin/bash
export CVS_SERVER_LOG=/home/cvs/CVS_SERVER_LOG
echo   $CVS_SERVER_LOG
date  $CVS_SERVER_LOG
echo cvs $*  $CVS_SERVER_LOG
echo   $CVS_SERVER_LOG
cvs-bin $* | tee -a $CVS_SERVER_LOG

When I execute Cygwin's cvs, I get this on the client side:

C:\Program Files\cvsntc:\cygwin\bin\cvs -t -t -t -n co myproject
 - main loop with [EMAIL PROTECTED]:/home/cvs/projects
 - safe_location( where=(null) )
 - Starting server: ssh -l user host cvs server
[EMAIL PROTECTED]'s password:
S- do_module (myproject, Updating, , )
S- do_module (myproject, Updating, , )
cvs-bin server: in directory myproject:
cvs-bin [server aborted]: there is no version here; run 'cvs-bin checkout' first
S- Create_Admin (., myproject, /home/cvs/projects/myproject, , , 0, 0)
S- fopen(/home/cvs/projects/CVSROOT/history,a)
 - Lock_Cleanup()

and this on the server side:

echo   $CVS_SERVER_LOG
date  $CVS_SERVER_LOG
echo cvs $*  $CVS_SERVER_LOG
echo   $CVS_SERVER_LOG
cvs-bin $* | tee -a $CVS_SERVER_LOG
[EMAIL PROTECTED] bin]# !tail
tail -f /home/cvs/CVS_SERVER_LOG
ok
E S- do_module (myproject, Updating, , )
Module-expansion myproject
ok
E S- do_module (myproject, Updating, , )
E cvs-bin server: in directory myproject:
E cvs-bin [server aborted]: there is no version here; run 'cvs-bin checkout' 
first
E S- Create_Admin (., myproject, /home/cvs/projects/myproject, , , 0, 0)
E S- fopen(/home/cvs/projects/CVSROOT/history,a)
error

This is as it should be.  When I execute CvsNT's cvs, I get this on the client 
side:

C:\Program Files\cvsnt.\cvs -t -t -t -n co myproject
  - Tracelevel set to 3.  PID is 3620
  - Session ID is e24419390921f88
  - Domain found: MYWORKGROUP
  - main loop with [EMAIL PROTECTED]:/home/cvs/projects
[EMAIL PROTECTED]'s password:

and this on the server side:


Thu Nov 11 11:18:11 EST 2004
cvs server

Valid-requests Root Valid-responses valid-requests Repository Directory 
Max-dotdot Static-directory Sticky Checkin-prog Update-prog Entry Kopt 
Checkin-time Modified Is-modified UseUnchanged Unchanged Notify Questionable 
Case Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set 
expand-modules ci co update diff log add remove update-patches 
gzip-file-contents status rdiff tag rtag import admin export history release 
watch-on watch-off watch-add watch-remove watchers editors init annotate noop 
version
ok

and the connection hangs.  It appears that the CvsNT client never sees the ok 
message from the server.

The WinXP firewall is turned off.  Any clues are greatly appreciated.

 - George Dinwiddie



 -Original Message-
 From: [EMAIL PROTECTED]
 [mailto:[EMAIL PROTECTED] Behalf Of
 Chris Weiss
 Sent: Thursday, October 07, 2004 3:17 PM
 To: [EMAIL PROTECTED]
 Subject: Please help troubleshooting connection problem via SSH
 
 
 I've got one client who is having trouble connecting to our 
 CVS server. 
 I'm trying to troubleshoot the problem, but am not having much luck.
 
 Our setup is CVS server 1.11.5, client 1.11.1.3, we're connecting via 
 SSH tunnel. We've got the keys syncronized, so the client 
 doesn't need 
 to enter a password to connect.
 I'm able to successfully connect using the client's account, 
 but he is 
 not. We've been successfully using this system for a while 
 with a dozen 
 users who are having no issues connecting.
 He can SSH in, so we know it's not a blocked port issue.
 The client's machine is WinXP (unknown if SP2 is installed)
 
 Client-wise, we're using WinCVS and Turtle - I've tried CVS from the 
 command prompt as well with no success.
 
 The symptoms are - if trying to do a Checkout or get a module 
 list, the 
 client freezes with no output at all. We've left it for minutes at a 
 time with no response.
 Here is the client's output for CVS Version:
 Client: Concurrent Versions System (CVSNT) 1.11.1.3  (Build 57k) 
 (client/server)
  
  Server:
 
 
 
 Does anyone have any ideas

RE: Please help troubleshooting connection problem via SSH (possible solution)

2004-11-11 Thread George Dinwiddie
In spite of the fact that the Cygwin CVS client continues to function, the root 
problem is apparently in the handling of named pipes within the cygwin1.dll 
file.  Running cygcheck -s on an installation of the latest version of Cygwin 
includes the results:
 k 2004/09/05 C:\cygwin\bin\cygwin1.dll
Cygwin DLL version info:
DLL version: 1.5.11
DLL epoch: 19
DLL bad signal mask: 19005
DLL old termios: 5
DLL malloc env: 28
API major: 0
API minor: 116
Shared data: 4
DLL identifier: cygwin1
Mount registry: 2
Cygnus registry name: Cygnus Solutions
Cygwin registry name: Cygwin
Program options name: Program Options
Cygwin mount registry name: mounts v2
Cygdrive flags: cygdrive flags
Cygdrive prefix: cygdrive prefix
Cygdrive default prefix:
Build date: Sat Sep 4 23:17:09 EDT 2004
Shared id: cygwin1S4

I renamed cygwin1.dll to cygwin1.5.11.dll and copied the dll from another 
machine (working under WinXP SP2).  Now the cygcheck -s output includes:
 1100k 2004/03/19 C:\cygwin\bin\cygwin1.dll
Cygwin DLL version info:
DLL version: 1.5.9
DLL epoch: 19
DLL bad signal mask: 19005
DLL old termios: 5
DLL malloc env: 28
API major: 0
API minor: 112
Shared data: 4
DLL identifier: cygwin1
Mount registry: 2
Cygnus registry name: Cygnus Solutions
Cygwin registry name: Cygwin
Program options name: Program Options
Cygwin mount registry name: mounts v2
Cygdrive flags: cygdrive flags
Cygdrive prefix: cygdrive prefix
Cygdrive default prefix:
Build date: Thu Mar 18 23:05:18 EST 2004
Shared id: cygwin1S4

I do not know if this change of DLL will cause problems for other Cygwin 
components, but it has allowed CvsNT (and derived clients WinCVS and 
TortoiseCVS) and Eclipse CVS to operate.

Another option is to uninstall WinXP SP2.

 - George

 -Original Message-
 From: [EMAIL PROTECTED]
 [mailto:[EMAIL PROTECTED] Behalf Of
 George Dinwiddie
 Sent: Thursday, November 11, 2004 12:09 PM
 To: Chris Weiss; [EMAIL PROTECTED]
 Subject: RE: Please help troubleshooting connection problem via SSH
 
 
 Chris,
 
 I do not believe this is an ssh issue.  I believe it's a 
 WinXP SP2 issue with CvsNT (which both WinCVS and TortoiseCVS 
 seem to use).  I'm having a similar problem with these as 
 well as with the Eclipse CVS client (which seems to be 
 written in Java).
 
 The production server is CVS version 1.11.17 and I can 
 connect with it via SSH using the Cygwin CVS client (also 
 version 1.11.17).  I cannot connect with it via SSH using 
 CVSNT version 2.0.58d.
 
 The SSH connection works fine, but the CVS client hangs.  In 
 order to see what was happening on the server side, I 
 experimented with an old CVS (version 1.11) setup I already 
 had on a private machine.  I did some grepping and found 
 reference to a CVS_SERVER_LOG environment variable, but that 
 doesn't seem to be used any more.  It's not mentioned in the 
 latest copy of the CVS manual and it doesn't seem to work.
 
 I renamed my cvs executable to cvs-bin and wrote this shell 
 script for cvs:
 
 #!/bin/bash
 export CVS_SERVER_LOG=/home/cvs/CVS_SERVER_LOG
 echo   $CVS_SERVER_LOG
 date  $CVS_SERVER_LOG
 echo cvs $*  $CVS_SERVER_LOG
 echo   $CVS_SERVER_LOG
 cvs-bin $* | tee -a $CVS_SERVER_LOG
 
 When I execute Cygwin's cvs, I get this on the client side:
 
 C:\Program Files\cvsntc:\cygwin\bin\cvs -t -t -t -n co myproject
  - main loop with [EMAIL PROTECTED]:/home/cvs/projects
  - safe_location( where=(null) )
  - Starting server: ssh -l user host cvs server
 [EMAIL PROTECTED]'s password:
 S- do_module (myproject, Updating, , )
 S- do_module (myproject, Updating, , )
 cvs-bin server: in directory myproject:
 cvs-bin [server aborted]: there is no version here; run 
 'cvs-bin checkout' first
 S- Create_Admin (., myproject, /home/cvs/projects/myproject, 
 , , 0, 0)
 S- fopen(/home/cvs/projects/CVSROOT/history,a)
  - Lock_Cleanup()
 
 and this on the server side:
 
 echo   $CVS_SERVER_LOG
 date  $CVS_SERVER_LOG
 echo cvs $*  $CVS_SERVER_LOG
 echo   $CVS_SERVER_LOG
 cvs-bin $* | tee -a $CVS_SERVER_LOG
 [EMAIL PROTECTED] bin]# !tail
 tail -f /home/cvs/CVS_SERVER_LOG
 ok
 E S- do_module (myproject, Updating, , )
 Module-expansion myproject
 ok
 E S- do_module (myproject, Updating, , )
 E cvs-bin server: in directory myproject:
 E cvs-bin [server aborted]: there is no version here; run 
 'cvs-bin checkout' first
 E S- Create_Admin (., myproject, 
 /home/cvs/projects/myproject, , , 0, 0)
 E S- fopen(/home/cvs/projects/CVSROOT/history,a)
 error
 
 This is as it should be.  When I execute CvsNT's cvs, I get 
 this on the client side:
 
 C:\Program Files\cvsnt.\cvs -t -t -t -n co

RE: Please help troubleshooting connection problem via SSH (possible solution)

2004-11-11 Thread ai26
In a message of Thu, 11 Nov 2004 15:27:15 -0500
Received on Thu, 11 Nov 2004 21:31:27 +0100

George Dinwiddie [EMAIL PROTECTED] wrote
to: Chris Weiss [EMAIL PROTECTED], [EMAIL PROTECTED]

In spite of the fact that the Cygwin CVS client continues to function, the 
root problem is apparently in the handling of named pipes within the 
cygwin1.dll file.  Running cygcheck -s on an installation of the latest 
version of Cygwin includes the results:
 k 2004/09/05 C:\cygwin\bin\cygwin1.dll
Cygwin DLL version info:
DLL version: 1.5.11
DLL epoch: 19
DLL bad signal mask: 19005
DLL old termios: 5
DLL malloc env: 28
API major: 0
API minor: 116
Shared data: 4
DLL identifier: cygwin1
Mount registry: 2
Cygnus registry name: Cygnus Solutions
Cygwin registry name: Cygwin
Program options name: Program Options
Cygwin mount registry name: mounts v2
Cygdrive flags: cygdrive flags
Cygdrive prefix: cygdrive prefix
Cygdrive default prefix:
Build date: Sat Sep 4 23:17:09 EDT 2004
Shared id: cygwin1S4

I renamed cygwin1.dll to cygwin1.5.11.dll and copied the dll from another 
machine (working under WinXP SP2).  Now the cygcheck -s output includes:
 1100k 2004/03/19 C:\cygwin\bin\cygwin1.dll
Cygwin DLL version info:
DLL version: 1.5.9
DLL epoch: 19
DLL bad signal mask: 19005
DLL old termios: 5
DLL malloc env: 28
API major: 0
API minor: 112
Shared data: 4
DLL identifier: cygwin1
Mount registry: 2
Cygnus registry name: Cygnus Solutions
Cygwin registry name: Cygwin
Program options name: Program Options
Cygwin mount registry name: mounts v2
Cygdrive flags: cygdrive flags
Cygdrive prefix: cygdrive prefix
Cygdrive default prefix:
Build date: Thu Mar 18 23:05:18 EST 2004
Shared id: cygwin1S4

I do not know if this change of DLL will cause problems for other Cygwin 
components, but it has allowed CvsNT (and derived clients WinCVS and 
TortoiseCVS) and Eclipse CVS to operate.

Interesting.  On my Win98 box cvs also only works with 1.5.9.  I've
replaced the newer cygwin1.dll's with the 1.5.9 because of that.  Maybe
you want to post this to the Cygwin mailing list ([EMAIL PROTECTED] I
believe).  Check the archives at http://www.cygwin.com/ml/cygwin

Michael


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/info-cvs


Re: AW: Please help troubleshooting connection problem via SSH

2004-10-08 Thread Chris Weiss
[EMAIL PROTECTED] wrote:
In a message of Thu, 7 Oct 2004 23:15:31 +0200
Received on Thu, 07 Oct 2004 23:20:56 +0200
Guus Leeuw jr. [EMAIL PROTECTED] wrote
to: 'Chris Weiss' [EMAIL PROTECTED]
 

-Ursprüngliche Nachricht-
Von: [EMAIL PROTECTED] 
[mailto:[EMAIL PROTECTED] Im 
Auftrag von Chris Weiss

FYI - the output of -t update is (the user/servernames have 
been changed 
to protect the innocent):

C:\c:\Program Files\gnu\WinCvs 1.3\cvs -z9 -t  update
 - main loop with 
CVSROOT=username@cvs.servername.com:/usr/local/cvsroot

And that's it... it'll sit until we ctrl-C out of it...
 

Remove the -z9 and retry. (Not that I think it makes any jack difference)
   

Probably not.
 

Plus isn't CVSROOT meant to say something like :ext: in case of SSH?
   

Exactly.  That CVSROOT as it appears above is broken.  Ought to be
something like :ext:[EMAIL PROTECTED]:/path/to/repository
And the env variable CVS_RSH must point to your ssh exectubable but the
trace will reveal that problem next.  (There is provision in WinCVS to
set that.)
 

Those issues should be moot with the WinCVS client though, right? If the 
client is set to SSH for Authentication, that's enough (it works for all 
our other users...)

Thanks for all the help, gang!
--
This message has been scanned for viruses and
dangerous content, and is believed to be clean.

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/info-cvs


Please help troubleshooting connection problem via SSH

2004-10-07 Thread Chris Weiss
I've got one client who is having trouble connecting to our CVS server. 
I'm trying to troubleshoot the problem, but am not having much luck.

Our setup is CVS server 1.11.5, client 1.11.1.3, we're connecting via 
SSH tunnel. We've got the keys syncronized, so the client doesn't need 
to enter a password to connect.
I'm able to successfully connect using the client's account, but he is 
not. We've been successfully using this system for a while with a dozen 
users who are having no issues connecting.
He can SSH in, so we know it's not a blocked port issue.
The client's machine is WinXP (unknown if SP2 is installed)

Client-wise, we're using WinCVS and Turtle - I've tried CVS from the 
command prompt as well with no success.

The symptoms are - if trying to do a Checkout or get a module list, the 
client freezes with no output at all. We've left it for minutes at a 
time with no response.
Here is the client's output for CVS Version:
Client: Concurrent Versions System (CVSNT) 1.11.1.3  (Build 57k) 
(client/server)

Server:

Does anyone have any ideas what could be causing his issues or any 
further steps to take to troubleshoot this? I'm new to the whole CVS 
thing (my experience was all Perforce) and this is all a trial-by-fire 
for me.

--
This message has been scanned for viruses and
dangerous content, and is believed to be clean.

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/info-cvs


Re: Please help troubleshooting connection problem via SSH

2004-10-07 Thread J. David Boyd
Chris Weiss [EMAIL PROTECTED] writes:

 I've got one client who is having trouble connecting to our CVS
 server. I'm trying to troubleshoot the problem, but am not having much
 luck.
 
 Our setup is CVS server 1.11.5, client 1.11.1.3, we're connecting via
 SSH tunnel. We've got the keys syncronized, so the client doesn't need
 to enter a password to connect.
 I'm able to successfully connect using the client's account, but he is
 not. We've been successfully using this system for a while with a
 dozen users who are having no issues connecting.
 He can SSH in, so we know it's not a blocked port issue.
 The client's machine is WinXP (unknown if SP2 is installed)
 
 Client-wise, we're using WinCVS and Turtle - I've tried CVS from the
 command prompt as well with no success.
 
 The symptoms are - if trying to do a Checkout or get a module list,
 the client freezes with no output at all. We've left it for minutes at
 a time with no response.
 Here is the client's output for CVS Version:
 Client: Concurrent Versions System (CVSNT) 1.11.1.3  (Build 57k)
 (client/server)
  Server:
 
 
 
 Does anyone have any ideas what could be causing his issues or any
 further steps to take to troubleshoot this? I'm new to the whole CVS
 thing (my experience was all Perforce) and this is all a trial-by-fire
 for me.

You say that you can use the client's account no problem, but you don't mean
his machine, just his login info,of course.  

It sounds as if his CVSROOT string is incorrect.  What did you all put into
the preferences section of WinCVS to connect him to your system?

That wouldn't stop him from manually SSHing into the system, but it would
certainly keep WinCVS from connecting.

Dave



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/info-cvs


Re: Please help troubleshooting connection problem via SSH

2004-10-07 Thread Chris Weiss
J. David Boyd wrote:
Chris Weiss [EMAIL PROTECTED] writes:
 

I've got one client who is having trouble connecting to our CVS
server. I'm trying to troubleshoot the problem, but am not having much
luck.
Our setup is CVS server 1.11.5, client 1.11.1.3, we're connecting via
SSH tunnel. We've got the keys syncronized, so the client doesn't need
to enter a password to connect.
I'm able to successfully connect using the client's account, but he is
not. We've been successfully using this system for a while with a
dozen users who are having no issues connecting.
He can SSH in, so we know it's not a blocked port issue.
The client's machine is WinXP (unknown if SP2 is installed)
Client-wise, we're using WinCVS and Turtle - I've tried CVS from the
command prompt as well with no success.
The symptoms are - if trying to do a Checkout or get a module list,
the client freezes with no output at all. We've left it for minutes at
a time with no response.
Here is the client's output for CVS Version:
Client: Concurrent Versions System (CVSNT) 1.11.1.3  (Build 57k)
(client/server)
Server:

Does anyone have any ideas what could be causing his issues or any
further steps to take to troubleshoot this? I'm new to the whole CVS
thing (my experience was all Perforce) and this is all a trial-by-fire
for me.
   

You say that you can use the client's account no problem, but you don't mean
his machine, just his login info,of course.  

It sounds as if his CVSROOT string is incorrect.  What did you all put into
the preferences section of WinCVS to connect him to your system?
That wouldn't stop him from manually SSHing into the system, but it would
certainly keep WinCVS from connecting.
Dave
 

I'm pretty sure it's not a CVSROOT issue unless there's something 
machine specific in that variable. We'd set it multiple times over the 
course of testing (it's not persistent in the shell) and several of 
those times were copy/pastes from CVSROOT settings that worked 
successfully on my machine (we've been debugging via IM).

I'm also guessing that if there was a bad CVSROOT, at least one of the 
clients would have given a descriptive error and not just hung.

Thanks for the ideas though!
--
This message has been scanned for viruses and
dangerous content, and is believed to be clean.

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/info-cvs


Re: Please help troubleshooting connection problem via SSH

2004-10-07 Thread ai26
In a message of Thu, 07 Oct 2004 13:24:49 -0700
Received on Thu, 07 Oct 2004 22:33:14 +0200

Chris Weiss [EMAIL PROTECTED] wrote to J. David Boyd [EMAIL PROTECTED]

J. David Boyd wrote:

Chris Weiss [EMAIL PROTECTED] writes:



I've got one client who is having trouble connecting to our CVS
server. I'm trying to troubleshoot the problem, but am not having much
luck.


Try a 
 
  cvs -t update 

or any other cvs command.  That traces the communication and might give
you a clou.

Michael


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/info-cvs


Re: Please help troubleshooting connection problem via SSH

2004-10-07 Thread J. David Boyd
Chris Weiss [EMAIL PROTECTED] writes:

 J. David Boyd wrote:
 
 Chris Weiss [EMAIL PROTECTED] writes:
 
   
 I've got one client who is having trouble connecting to our CVS
 server. I'm trying to troubleshoot the problem, but am not having much
 luck.
 
 Our setup is CVS server 1.11.5, client 1.11.1.3, we're connecting via
 SSH tunnel. We've got the keys syncronized, so the client doesn't need
 to enter a password to connect.
 I'm able to successfully connect using the client's account, but he is
 not. We've been successfully using this system for a while with a
 dozen users who are having no issues connecting.
 He can SSH in, so we know it's not a blocked port issue.
 The client's machine is WinXP (unknown if SP2 is installed)
 
 Client-wise, we're using WinCVS and Turtle - I've tried CVS from the
 command prompt as well with no success.
 
 The symptoms are - if trying to do a Checkout or get a module list,
 the client freezes with no output at all. We've left it for minutes at
 a time with no response.
 Here is the client's output for CVS Version:
 Client: Concurrent Versions System (CVSNT) 1.11.1.3  (Build 57k)
 (client/server)
  Server:
 
 
 
 Does anyone have any ideas what could be causing his issues or any
 further steps to take to troubleshoot this? I'm new to the whole CVS
 thing (my experience was all Perforce) and this is all a trial-by-fire
 for me.
 
 
 You say that you can use the client's account no problem, but you don't mean
  his machine, just his login info,of course.  It sounds as if his
  CVSROOT string is incorrect.  What did you all put into
 the preferences section of WinCVS to connect him to your system?
 
 That wouldn't stop him from manually SSHing into the system, but it would
 certainly keep WinCVS from connecting.
 
 Dave
 
   
 I'm pretty sure it's not a CVSROOT issue unless there's something
 machine specific in that variable. We'd set it multiple times over the
 course of testing (it's not persistent in the shell) and several of
 those times were copy/pastes from CVSROOT settings that worked
 successfully on my machine (we've been debugging via IM).
 
 I'm also guessing that if there was a bad CVSROOT, at least one of the
 clients would have given a descriptive error and not just hung.
 
 Thanks for the ideas though!
 

So you are saying that the client can connect to CVS through SSH on the
command line?  Just not in WinCVS or Turtle?  That definitely would not be a
CVSROOT problem then.

Sorry for being no help...





___
Info-cvs mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/info-cvs


Re: Please help troubleshooting connection problem via SSH

2004-10-07 Thread Chris Weiss
J. David Boyd wrote:
Chris Weiss [EMAIL PROTECTED] writes:
 

J. David Boyd wrote:
   

Chris Weiss [EMAIL PROTECTED] writes:
 

I've got one client who is having trouble connecting to our CVS
server. I'm trying to troubleshoot the problem, but am not having much
luck.
Our setup is CVS server 1.11.5, client 1.11.1.3, we're connecting via
SSH tunnel. We've got the keys syncronized, so the client doesn't need
to enter a password to connect.
I'm able to successfully connect using the client's account, but he is
not. We've been successfully using this system for a while with a
dozen users who are having no issues connecting.
He can SSH in, so we know it's not a blocked port issue.
The client's machine is WinXP (unknown if SP2 is installed)
Client-wise, we're using WinCVS and Turtle - I've tried CVS from the
command prompt as well with no success.
The symptoms are - if trying to do a Checkout or get a module list,
the client freezes with no output at all. We've left it for minutes at
a time with no response.
Here is the client's output for CVS Version:
Client: Concurrent Versions System (CVSNT) 1.11.1.3  (Build 57k)
(client/server)
Server:

Does anyone have any ideas what could be causing his issues or any
further steps to take to troubleshoot this? I'm new to the whole CVS
thing (my experience was all Perforce) and this is all a trial-by-fire
for me.
  
   

You say that you can use the client's account no problem, but you don't mean
his machine, just his login info,of course.  It sounds as if his
CVSROOT string is incorrect.  What did you all put into
the preferences section of WinCVS to connect him to your system?
That wouldn't stop him from manually SSHing into the system, but it would
certainly keep WinCVS from connecting.
Dave
 

I'm pretty sure it's not a CVSROOT issue unless there's something
machine specific in that variable. We'd set it multiple times over the
course of testing (it's not persistent in the shell) and several of
those times were copy/pastes from CVSROOT settings that worked
successfully on my machine (we've been debugging via IM).
I'm also guessing that if there was a bad CVSROOT, at least one of the
clients would have given a descriptive error and not just hung.
Thanks for the ideas though!
   

So you are saying that the client can connect to CVS through SSH on the
command line?  Just not in WinCVS or Turtle?  That definitely would not be a
CVSROOT problem then.
Sorry for being no help...
 

Sorry - that was my bad for being unclear. I meant that we're able to 
connect for an SSH shell session, so I know it's not an issue with SSH 
authentication or the port being blocked. We can't connected to the 
server regardless of the client being used.

I'll check out the -t argument.
--
This message has been scanned for viruses and
dangerous content, and is believed to be clean.

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/info-cvs


Re: Please help troubleshooting connection problem via SSH

2004-10-07 Thread Chris Weiss
Chris Weiss wrote:
J. David Boyd wrote:
Chris Weiss [EMAIL PROTECTED] writes:
 

J. David Boyd wrote:
  

Chris Weiss [EMAIL PROTECTED] writes:


I've got one client who is having trouble connecting to our CVS
server. I'm trying to troubleshoot the problem, but am not having 
much
luck.

Our setup is CVS server 1.11.5, client 1.11.1.3, we're connecting via
SSH tunnel. We've got the keys syncronized, so the client doesn't 
need
to enter a password to connect.
I'm able to successfully connect using the client's account, but 
he is
not. We've been successfully using this system for a while with a
dozen users who are having no issues connecting.
He can SSH in, so we know it's not a blocked port issue.
The client's machine is WinXP (unknown if SP2 is installed)

Client-wise, we're using WinCVS and Turtle - I've tried CVS from the
command prompt as well with no success.
The symptoms are - if trying to do a Checkout or get a module list,
the client freezes with no output at all. We've left it for 
minutes at
a time with no response.
Here is the client's output for CVS Version:
Client: Concurrent Versions System (CVSNT) 1.11.1.3  (Build 57k)
(client/server)
Server:


Does anyone have any ideas what could be causing his issues or any
further steps to take to troubleshoot this? I'm new to the whole CVS
thing (my experience was all Perforce) and this is all a 
trial-by-fire
for me.

You say that you can use the client's account no problem, but you 
don't mean
his machine, just his login info,of course.  It sounds as if his
CVSROOT string is incorrect.  What did you all put into
the preferences section of WinCVS to connect him to your system?

That wouldn't stop him from manually SSHing into the system, but it 
would
certainly keep WinCVS from connecting.

Dave

I'm pretty sure it's not a CVSROOT issue unless there's something
machine specific in that variable. We'd set it multiple times over the
course of testing (it's not persistent in the shell) and several of
those times were copy/pastes from CVSROOT settings that worked
successfully on my machine (we've been debugging via IM).
I'm also guessing that if there was a bad CVSROOT, at least one of the
clients would have given a descriptive error and not just hung.
Thanks for the ideas though!
  

So you are saying that the client can connect to CVS through SSH on the
command line?  Just not in WinCVS or Turtle?  That definitely would 
not be a
CVSROOT problem then.

Sorry for being no help...
 

Sorry - that was my bad for being unclear. I meant that we're able to 
connect for an SSH shell session, so I know it's not an issue with SSH 
authentication or the port being blocked. We can't connected to the 
server regardless of the client being used.

I'll check out the -t argument.
FYI - the output of -t update is (the user/servernames have been changed 
to protect the innocent):

C:\c:\Program Files\gnu\WinCvs 1.3\cvs -z9 -t  update
 - main loop with 
CVSROOT=username@cvs.servername.com:/usr/local/cvsroot

And that's it... it'll sit until we ctrl-C out of it...
--
This message has been scanned for viruses and
dangerous content, and is believed to be clean.

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/info-cvs


AW: Please help troubleshooting connection problem via SSH

2004-10-07 Thread Guus Leeuw jr.
 -Ursprüngliche Nachricht-
 Von: [EMAIL PROTECTED] 
 [mailto:[EMAIL PROTECTED] Im 
 Auftrag von Chris Weiss
 
 FYI - the output of -t update is (the user/servernames have 
 been changed 
 to protect the innocent):
 
 C:\c:\Program Files\gnu\WinCvs 1.3\cvs -z9 -t  update
   - main loop with 
 CVSROOT=username@cvs.servername.com:/usr/local/cvsroot
 
 And that's it... it'll sit until we ctrl-C out of it...

Remove the -z9 and retry. (Not that I think it makes any jack difference)

Plus isn't CVSROOT meant to say something like :ext: in case of SSH? (I
don't use SSH tunnels with my CVS so I really don't know, but from the top
of my head...)

Guus

---
Outgoing mail is certified Virus Free.
Checked by AVG anti-virus system (http://www.grisoft.com).
Version: 6.0.712 / Virus Database: 468 - Release Date: 27/06/2004
 



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/info-cvs


Re: Please help troubleshooting connection problem via SSH

2004-10-07 Thread Chris Weiss
Larry Jones wrote:
Chris Weiss writes:
 

C:\c:\Program Files\gnu\WinCvs 1.3\cvs -z9 -t  update
 - main loop with 
CVSROOT=username@cvs.servername.com:/usr/local/cvsroot

And that's it... it'll sit until we ctrl-C out of it...
   

Get rid of the -z9 -- there were some interoperability problems
between different client and server releases with compression.  If that
fixes the problem, upgrade your server to the current release.
-Larry Jones
Everybody's a slave to routine. -- Calvin
 

No such luck with changing/removing the compression. We're now 
re-installing CVS and Cygwin. The bummer of it is, this is an older 
laptop with a dead CD-ROM drive or we'd reformat and start from scratch.

--
This message has been scanned for viruses and
dangerous content, and is believed to be clean.

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/info-cvs


RE: AW: Please help troubleshooting connection problem via SSH

2004-10-07 Thread ai26
In a message of Thu, 7 Oct 2004 23:15:31 +0200
Received on Thu, 07 Oct 2004 23:20:56 +0200

Guus Leeuw jr. [EMAIL PROTECTED] wrote
to: 'Chris Weiss' [EMAIL PROTECTED]

 -Ursprüngliche Nachricht-
 Von: [EMAIL PROTECTED] 
 [mailto:[EMAIL PROTECTED] Im 
 Auftrag von Chris Weiss
 
 FYI - the output of -t update is (the user/servernames have 
 been changed 
 to protect the innocent):
 
 C:\c:\Program Files\gnu\WinCvs 1.3\cvs -z9 -t  update
   - main loop with 
 CVSROOT=username@cvs.servername.com:/usr/local/cvsroot
 
 And that's it... it'll sit until we ctrl-C out of it...

Remove the -z9 and retry. (Not that I think it makes any jack difference)

Probably not.


Plus isn't CVSROOT meant to say something like :ext: in case of SSH?

Exactly.  That CVSROOT as it appears above is broken.  Ought to be
something like :ext:[EMAIL PROTECTED]:/path/to/repository

And the env variable CVS_RSH must point to your ssh exectubable but the
trace will reveal that problem next.  (There is provision in WinCVS to
set that.)

Michael


--
Michael Lemke
Sternwarte Bamberg, University of Erlangen-Nürnberg, Germany
([EMAIL PROTECTED])


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/info-cvs


RE: Merge conflict - please help.

2004-09-21 Thread Christopher.Fouts
Use tkCVS or the like to resolve your conflicts.

-Original Message-
From: [EMAIL PROTECTED] 
[mailto:[EMAIL PROTECTED]
] On Behalf Of Dewan, Mohit
Sent: Monday, September 20, 2004 6:22 PM
To: [EMAIL PROTECTED]
Subject: Merge conflict - please help.


Hi,

Am trying to merge code from different releases on a vendor 
branch with the main trunk.  Its giving conflicts on some 
files yet some files merge just fine.  Please see attachment 
for my scenario.

The main trunk is on the left and version 1.1.1 and up are 
vendor versions.  Am attempting to merge code from version 
1.1.1.1 to 1.1.1.3 with revision 1.2 (on trunk) to make revision 1.3.  

Version 1.1.1.1 has the tag v13_01
Version 1.1.1.3 has the tag v19_05
Module name: md

The command I am using (from my working directory) is:
cvs checkout -kk -j v13_01 -j v19_05 md

I get a conflict while doing the above.  Once again, the 
conflict comes up with some files but others (within the same 
directory) merge just fine.  

Any ideas/hints will be appreciated.



Mohit Dewan



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/info-cvs


RE: Merge conflict - please help.

2004-09-21 Thread Dewan, Mohit
I have been using tkCVS/tkDiff so far but that doesn't solve the
problem.  What I don't understand is that why conflicts show up on
certain files only.  Not sure if I am doing something wrong.

-Original Message-
From: [EMAIL PROTECTED]
[mailto:[EMAIL PROTECTED] 
Sent: Tuesday, September 21, 2004 5:23 AM
To: Dewan, Mohit; [EMAIL PROTECTED]
Subject: RE: Merge conflict - please help.

Use tkCVS or the like to resolve your conflicts.

-Original Message-
From: [EMAIL PROTECTED] 
[mailto:[EMAIL PROTECTED]
] On Behalf Of Dewan, Mohit
Sent: Monday, September 20, 2004 6:22 PM
To: [EMAIL PROTECTED]
Subject: Merge conflict - please help.


Hi,

Am trying to merge code from different releases on a vendor 
branch with the main trunk.  Its giving conflicts on some 
files yet some files merge just fine.  Please see attachment 
for my scenario.

The main trunk is on the left and version 1.1.1 and up are 
vendor versions.  Am attempting to merge code from version 
1.1.1.1 to 1.1.1.3 with revision 1.2 (on trunk) to make revision 1.3.  

Version 1.1.1.1 has the tag v13_01
Version 1.1.1.3 has the tag v19_05
Module name: md

The command I am using (from my working directory) is:
cvs checkout -kk -j v13_01 -j v19_05 md

I get a conflict while doing the above.  Once again, the 
conflict comes up with some files but others (within the same 
directory) merge just fine.  

Any ideas/hints will be appreciated.



Mohit Dewan



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/info-cvs


RE: Merge conflict - please help.

2004-09-21 Thread Christopher.Fouts
File diffs are determined using basically the unix diff algorithm.
Sometimes it indeed finds diffs that it can resolve, and sometimes
not. When it can't resolve them, it flags them as conflicts. When
you're merging files, I would expect diffs to result, some of which
can be resolved, and some not...



-Original Message-
From: Dewan, Mohit [mailto:[EMAIL PROTECTED] 
Sent: Tuesday, September 21, 2004 11:06 AM
To: Fouts Christopher (IFNA MP DC); [EMAIL PROTECTED]
Subject: RE: Merge conflict - please help.


I have been using tkCVS/tkDiff so far but that doesn't solve 
the problem.  What I don't understand is that why conflicts 
show up on certain files only.  Not sure if I am doing something wrong.

-Original Message-
From: [EMAIL PROTECTED] 
[mailto:[EMAIL PROTECTED] 
Sent: Tuesday, 
September 21, 2004 5:23 AM
To: Dewan, Mohit; [EMAIL PROTECTED]
Subject: RE: Merge conflict - please help.

Use tkCVS or the like to resolve your conflicts.

-Original Message-
From: [EMAIL PROTECTED]
[mailto:[EMAIL PROTECTED]
] On Behalf Of Dewan, Mohit
Sent: Monday, September 20, 2004 6:22 PM
To: [EMAIL PROTECTED]
Subject: Merge conflict - please help.


Hi,

Am trying to merge code from different releases on a vendor
branch with the main trunk.  Its giving conflicts on some 
files yet some files merge just fine.  Please see attachment 
for my scenario.

The main trunk is on the left and version 1.1.1 and up are
vendor versions.  Am attempting to merge code from version 
1.1.1.1 to 1.1.1.3 with revision 1.2 (on trunk) to make 
revision 1.3.  

Version 1.1.1.1 has the tag v13_01
Version 1.1.1.3 has the tag v19_05
Module name: md

The command I am using (from my working directory) is:
cvs checkout -kk -j v13_01 -j v19_05 md

I get a conflict while doing the above.  Once again, the
conflict comes up with some files but others (within the same 
directory) merge just fine.  

Any ideas/hints will be appreciated.



Mohit Dewan




___
Info-cvs mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/info-cvs


RE: Merge conflict - please help.

2004-09-21 Thread Farbstein, Charlie
The only possibility is that the changes your organization made (in creating
revision 1.2) conflict with changes the vendor made between the two
releases.  It is only reasonable that only some files (probably very few)
have conflicts. 

-Original Message-
From: Dewan, Mohit [mailto:[EMAIL PROTECTED]
Sent: Tuesday, September 21, 2004 8:06 AM
To: [EMAIL PROTECTED]; [EMAIL PROTECTED]
Subject: RE: Merge conflict - please help.


I have been using tkCVS/tkDiff so far but that doesn't solve the
problem.  What I don't understand is that why conflicts show up on
certain files only.  Not sure if I am doing something wrong.

-Original Message-
From: [EMAIL PROTECTED]
[mailto:[EMAIL PROTECTED] 
Sent: Tuesday, September 21, 2004 5:23 AM
To: Dewan, Mohit; [EMAIL PROTECTED]
Subject: RE: Merge conflict - please help.

Use tkCVS or the like to resolve your conflicts.

-Original Message-
From: [EMAIL PROTECTED] 
[mailto:[EMAIL PROTECTED]
] On Behalf Of Dewan, Mohit
Sent: Monday, September 20, 2004 6:22 PM
To: [EMAIL PROTECTED]
Subject: Merge conflict - please help.


Hi,

Am trying to merge code from different releases on a vendor 
branch with the main trunk.  Its giving conflicts on some 
files yet some files merge just fine.  Please see attachment 
for my scenario.

The main trunk is on the left and version 1.1.1 and up are 
vendor versions.  Am attempting to merge code from version 
1.1.1.1 to 1.1.1.3 with revision 1.2 (on trunk) to make revision 1.3.  

Version 1.1.1.1 has the tag v13_01
Version 1.1.1.3 has the tag v19_05
Module name: md

The command I am using (from my working directory) is:
cvs checkout -kk -j v13_01 -j v19_05 md

I get a conflict while doing the above.  Once again, the 
conflict comes up with some files but others (within the same 
directory) merge just fine.  

Any ideas/hints will be appreciated.



Mohit Dewan



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/info-cvs


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/info-cvs


Merge conflict - please help.

2004-09-20 Thread Dewan, Mohit
Hi,

Am trying to merge code from different releases on a vendor branch with
the main trunk.  Its giving conflicts on some files yet some files merge
just fine.  Please see attachment for my scenario.

The main trunk is on the left and version 1.1.1 and up are vendor
versions.  Am attempting to merge code from version 1.1.1.1 to 1.1.1.3
with revision 1.2 (on trunk) to make revision 1.3.  

Version 1.1.1.1 has the tag v13_01
Version 1.1.1.3 has the tag v19_05
Module name: md

The command I am using (from my working directory) is:
cvs checkout -kk -j v13_01 -j v19_05 md

I get a conflict while doing the above.  Once again, the conflict comes
up with some files but others (within the same directory) merge just
fine.  

Any ideas/hints will be appreciated.



Mohit Dewan
attachment: cvs.GIF___
Info-cvs mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/info-cvs


Newbie at wits' end: please help!

2004-05-13 Thread J Krugman



OK, here's the situation:
  
  bash% pwd
  /home/krugman/scratch/d0
  bash% ls -F
  bar/ foo/
  bash% cvs import -m test myproj krugman test
  cvs import: Importing /cvs/myproj/foo
  N myproj/foo/hello.c 
  cvs import: Importing /cvs/myproj/bar
  N myproj/bar/ciao.c

  No conflicts created by this import

  bash% cd ..
  bash% cvs co -d d0 myproj
  cvs checkout: Updating d0
  ? d0/foo
  ? d0/bar
  bash%

What must I do differently during the import stage such that cvs
recognizes bar and foo in the subsequent checkout step?

Also, can someone tell me exactly where in the manual is the answer
to this question.  I read it till my eyes bled, but I wasn't able
to find the answer to this simple question.

TIA,

jill

-- 
To  se^n]d  me  m~a}i]l  r%e*m?o\v[e  bit from my a|d)d:r{e:s]s.

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


RE: Newbie at wits' end: please help!

2004-05-13 Thread Jim.Hyslop
J Krugman wrote:
 OK, here's the situation:
   
   bash% pwd
   /home/krugman/scratch/d0
   bash% ls -F
   bar/ foo/
   bash% cvs import -m test myproj krugman test
   cvs import: Importing /cvs/myproj/foo
   N myproj/foo/hello.c 
   cvs import: Importing /cvs/myproj/bar
   N myproj/bar/ciao.c
 
   No conflicts created by this import
 
   bash% cd ..
   bash% cvs co -d d0 myproj
   cvs checkout: Updating d0
   ? d0/foo
   ? d0/bar
   bash%
 
 What must I do differently during the import stage such that cvs
 recognizes bar and foo in the subsequent checkout step?
Nothing. The problem is in your checkout step - you're trying to check the
files out into a pre-existing directory, which has a directory name that
conflicts with the one CVS is trying to check out.

Try checking it out into a completely empty directory. Remove the '-d'
option, for example, or create an empty directory and cd to that directory
before issuing the checkout command.

-- 
Jim Hyslop
Senior Software Designer
Leitch Technology International Inc. (http://www.leitch.com)
Columnist, C/C++ Users Journal (http://www.cuj.com/experts)



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Please help..

2003-11-26 Thread John Wards
Hi All,

I am seriously new to CVS.

I have a large project that has been developed by my self for the past 18 
months but is about to be taken on by a few other people so I though CVS 
would be a good way of working.

I seem to have turned all of my original source files within the directory to 
have a .v extention and a lot of stuff has been added to these files.

Please tell me their is an easy way to get my files back!

I seem to have figurered out now how to make a repository from my original 
source files but they all have a double .v (.v.v) file extention now!!! Doh.

Thanks in advance!!
Cheers
John



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: Please help..

2003-11-26 Thread David Wood
Two things. 

First, did you work for 18 months on something without making backups? 

If you never made backups, then whether it was a mistake setting up CVS, 
some other kind of mistake, hardware failure, fire, or theft, you were 
destined to lose your work. I hope, however you resolve this issue, that 
you will always make nightly backups in the future. If you are ahead of 
me, and you have backups after all, then you can always use them to undo 
whatever you've done. I'm guessing, but at this point it may be easiest.

Second, to get help you will need to be much more specific about exactly 
what you did when you figured out how to make a repository from your 
original source files. How did you set everything up (CVSROOT, etc)? What 
commands did you run? It sounds like you have some confusion about 
repositories versus working directories and the import process. Did you 
read the CVS manual before you started? I fear from your description 
you've gone pretty far down the wrong way. 

[EMAIL PROTECTED] wrote on 11/26/2003 
11:32:10 AM:

 Hi All,
 
 I am seriously new to CVS.
 
 I have a large project that has been developed by my self for the past 
18 
 months but is about to be taken on by a few other people so I though CVS 

 would be a good way of working.
 
 I seem to have turned all of my original source files within the 
directory to 
 have a .v extention and a lot of stuff has been added to these files.
 
 Please tell me their is an easy way to get my files back!
 
 I seem to have figurered out now how to make a repository from my 
original 
 source files but they all have a double .v (.v.v) file extention now!!! 
Doh.
 
 Thanks in advance!!
 Cheers
 John
 
 
 
 ___
 Info-cvs mailing list
 [EMAIL PROTECTED]
 http://mail.gnu.org/mailman/listinfo/info-cvs



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: Please help..

2003-11-26 Thread David Wood
You need to spend some time with the manual, and/or the various tutorials 
on the subject. As you are discovering, if you're not understanding the 
manual, forging ahead anyway may not be the best decision.

A repository is a database (that holds its data in RCS files - ending in 
.v). You create a repository in an _empty_ directory, somewhere separate 
(with cvs init), and then you import sources into it from wherever you 
have them (with cvs import). 

Then you do a cvs checkout to create a new CVS working directory from the 
repository - and that is where you then do your work. (Often people will 
move or zip the original directory they imported from, and then move their 
CVS working directory into its place.)

You've created a repository right on top of where you are working, which 
is bad. I confess at this point I'm not sure what you've got in those 
files (perhaps someone wiser than myself can offer a shortcut?), but my 
best guess is that it will be easier to recover from backups than to 
reconstruct your sources from what's left of them now (.v.v files).

At any rate, since you have backups, there is no reason to panic. In the 
future, just put your repository somewhere separate (/home/cvs/repository 
?). And of course, have another go at the manual (or some of the other 
reading materials) to get a better handle on how the system works.

John Wards [EMAIL PROTECTED] wrote on 11/26/2003 12:25:42 PM:

 On Wednesday 26 November 2003 4:57 pm, David Wood wrote:
  First, did you work for 18 months on something without making backups?
 
 Yes yes of course, but they are not with me currently and I am in a bit 
of a 
 panic!
 
  Second, to get help you will need to be much more specific about 
exactly
  what you did when you figured out how to make a repository from your
  original source files. How did you set everything up (CVSROOT, etc)? 
What
  commands did you run? It sounds like you have some confusion about
  repositories versus working directories and the import process. Did 
you
  read the CVS manual before you started? I fear from your description
  you've gone pretty far down the wrong way.
 
 Yes I read the manual and I should have probably been a bit more 
detailed but 
 I thought ah someone wil know an easy undo comand.seems not then :-(
 
 I got a bit confused with all the CVSROOT stuff etc.
 
 My source files are in /home/johnwards/www/sportnetwork
 
 I thought I should have done this:
 
 CVSROOT=/home/johnwards/www
 export CVSROOT
 cvs init
 
 Then:
 cvs import -m SportNetwork first import -d sportnetwork sportnetwork 
start
 
 This was wrong :-( I think. As its changed all my files...
 
 I am really confused by the manual...all I want to do is set up CVS 
using 
 my source files...how on earth do you do it as I am really 
confused..
 
 John
 
 
 



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: Please help..

2003-11-26 Thread Steve deRosier
David,

Perhaps John could try this?
A suggestion to untangle:
1. Create a repository properly.
2. Copy the .v.v files into the repository manually.
3. Checkout the files into a working directory. (getting a .v file)
4. Copy the .v files manually into the repository.
5. Checkout the files into a working directory. (hopefully getting back 
the originals.)

This assumes that the creating the repository over the original files 
didn't muck them up too much.

John,
Don't just try the above suggestion till we get more input.  I'm just 
floating an idea and I think the experts here might have something more 
to say about it.

Understanding how the repository is different from the working directory 
is crucial.  A few clif notes:
* You create a repository in an empty directory.  This repository is 
separate and very different from the data you actually work on.  In our 
case our repository is in /swdev/cvsroot.  This is what the CVSROOT 
environment variable is set to.
* You use ONLY cvs commands to get data into and out of the repository. 
 Ideally you'd never directly touch the repository data.
* You work in a separate working directory (off of your home directory 
probably, in my case /home/derosier/projects) and you check out your 
source code modules there.  When you've made some changes you want to 
check in, you do a 'cvs commit' command.
* Even if you run CVS locally, think of it as a server.  It's a black 
box where you store things.  You make requests to get data out, work on 
it, and then make a request to store data back in. From an OOP point of 
view: It is encapsulated data with a very well defined interface or API. 
 Use the interface, don't touch the data.
* If the above doesn't make sense to you, then read it again, read the 
CVS manual again until it makes sense.  Do not try to setup and use CVS 
without understanding this.

Hope this helps,
- Steve
David Wood wrote:
You need to spend some time with the manual, and/or the various tutorials 
on the subject. As you are discovering, if you're not understanding the 
manual, forging ahead anyway may not be the best decision.

A repository is a database (that holds its data in RCS files - ending in 
.v). You create a repository in an _empty_ directory, somewhere separate 
(with cvs init), and then you import sources into it from wherever you 
have them (with cvs import). 

Then you do a cvs checkout to create a new CVS working directory from the 
repository - and that is where you then do your work. (Often people will 
move or zip the original directory they imported from, and then move their 
CVS working directory into its place.)

You've created a repository right on top of where you are working, which 
is bad. I confess at this point I'm not sure what you've got in those 
files (perhaps someone wiser than myself can offer a shortcut?), but my 
best guess is that it will be easier to recover from backups than to 
reconstruct your sources from what's left of them now (.v.v files).

At any rate, since you have backups, there is no reason to panic. In the 
future, just put your repository somewhere separate (/home/cvs/repository 
?). And of course, have another go at the manual (or some of the other 
reading materials) to get a better handle on how the system works.

John Wards [EMAIL PROTECTED] wrote on 11/26/2003 12:25:42 PM:


On Wednesday 26 November 2003 4:57 pm, David Wood wrote:

First, did you work for 18 months on something without making backups?
Yes yes of course, but they are not with me currently and I am in a bit 
of a 

panic!


Second, to get help you will need to be much more specific about 
exactly

what you did when you figured out how to make a repository from your
original source files. How did you set everything up (CVSROOT, etc)? 
What

commands did you run? It sounds like you have some confusion about
repositories versus working directories and the import process. Did 
you

read the CVS manual before you started? I fear from your description
you've gone pretty far down the wrong way.
Yes I read the manual and I should have probably been a bit more 
detailed but 

I thought ah someone wil know an easy undo comand.seems not then :-(

I got a bit confused with all the CVSROOT stuff etc.

My source files are in /home/johnwards/www/sportnetwork

I thought I should have done this:

CVSROOT=/home/johnwards/www
export CVSROOT
cvs init
Then:
cvs import -m SportNetwork first import -d sportnetwork sportnetwork 
start

This was wrong :-( I think. As its changed all my files...

I am really confused by the manual...all I want to do is set up CVS 
using 

my source files...how on earth do you do it as I am really 
confused..

John







___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: Please help..

2003-11-26 Thread David Wood
I had the same thought, Steve, and I think the same concern - given what 
he did, the repository _might_ have been a valid one the first time 
through - and it might be a valid repository of the repository now. But 
without knowing the nuts and bolts of the repository and import process, I 
can think of reasons why it wouldn't be. 

Of course, there's not much to lose in performing the experiment, as long 
as you take care and keep copies of everything. I'll be curious to hear if 
following these instructions would work.

[EMAIL PROTECTED] wrote on 11/26/2003 
02:46:10 PM:

 David,
 
 Perhaps John could try this?
 A suggestion to untangle:
 
 1. Create a repository properly.
 2. Copy the .v.v files into the repository manually.
 3. Checkout the files into a working directory. (getting a .v file)
 4. Copy the .v files manually into the repository.
 5. Checkout the files into a working directory. (hopefully getting back 
 the originals.)
 
 This assumes that the creating the repository over the original files 
 didn't muck them up too much.
 
 John,
 Don't just try the above suggestion till we get more input.  I'm just 
 floating an idea and I think the experts here might have something more 
 to say about it.
 
 Understanding how the repository is different from the working directory 

 is crucial.  A few clif notes:
 * You create a repository in an empty directory.  This repository is 
 separate and very different from the data you actually work on.  In our 
 case our repository is in /swdev/cvsroot.  This is what the CVSROOT 
 environment variable is set to.
 * You use ONLY cvs commands to get data into and out of the repository. 
   Ideally you'd never directly touch the repository data.
 * You work in a separate working directory (off of your home directory 
 probably, in my case /home/derosier/projects) and you check out your 
 source code modules there.  When you've made some changes you want to 
 check in, you do a 'cvs commit' command.
 * Even if you run CVS locally, think of it as a server.  It's a black 
 box where you store things.  You make requests to get data out, work on 
 it, and then make a request to store data back in. From an OOP point of 
 view: It is encapsulated data with a very well defined interface or API. 

   Use the interface, don't touch the data.
 * If the above doesn't make sense to you, then read it again, read the 
 CVS manual again until it makes sense.  Do not try to setup and use CVS 
 without understanding this.
 
 Hope this helps,
 - Steve
 
 
 David Wood wrote:
  You need to spend some time with the manual, and/or the various 
tutorials 
  on the subject. As you are discovering, if you're not understanding 
the 
  manual, forging ahead anyway may not be the best decision.
  
  A repository is a database (that holds its data in RCS files - ending 
in 
  .v). You create a repository in an _empty_ directory, somewhere 
separate 
  (with cvs init), and then you import sources into it from wherever you 

  have them (with cvs import). 
  
  Then you do a cvs checkout to create a new CVS working directory from 
the 
  repository - and that is where you then do your work. (Often people 
will 
  move or zip the original directory they imported from, and then move 
their 
  CVS working directory into its place.)
  
  You've created a repository right on top of where you are working, 
which 
  is bad. I confess at this point I'm not sure what you've got in those 
  files (perhaps someone wiser than myself can offer a shortcut?), but 
my 
  best guess is that it will be easier to recover from backups than to 
  reconstruct your sources from what's left of them now (.v.v files).
  
  At any rate, since you have backups, there is no reason to panic. In 
the 
  future, just put your repository somewhere separate 
(/home/cvs/repository 
  ?). And of course, have another go at the manual (or some of the other 

  reading materials) to get a better handle on how the system works.
  
  John Wards [EMAIL PROTECTED] wrote on 11/26/2003 12:25:42 PM:
  
  
 On Wednesday 26 November 2003 4:57 pm, David Wood wrote:
 
 First, did you work for 18 months on something without making 
backups?
 
 Yes yes of course, but they are not with me currently and I am in a 
bit 
  
  of a 
  
 panic!
 
 
 Second, to get help you will need to be much more specific about 
  
  exactly
  
 what you did when you figured out how to make a repository from your
 original source files. How did you set everything up (CVSROOT, etc)? 

  
  What
  
 commands did you run? It sounds like you have some confusion about
 repositories versus working directories and the import process. Did 
  
  you
  
 read the CVS manual before you started? I fear from your description
 you've gone pretty far down the wrong way.
 
 Yes I read the manual and I should have probably been a bit more 
  
  detailed but 
  
 I thought ah someone wil know an easy undo comand.seems not then 
:-(
 
 I got a bit confused with all the CVSROOT 

Re: Please help..

2003-11-26 Thread [EMAIL PROTECTED]
David,

Have you tried to check out files from the repository you created?
I understand there is some question as to the integrity of the repository
you created, but I can think of no better way to determine if all is
well than to try a checkout.

The safest way to do this is the following:

export CVSROOT=/home/johnwards/www
mkdir /tmp/test_checkout
cd /tmp/test_checkout
cvs co sportnetwork

It sounds to me from reading your description of how you created this
repository, all you did was create a whole bunch of ,v files in the same
directory where the source files you imported were located. Not how you want
to normally create a repository, but that should not have resulted in any
data loss of the files you imported.

I just tried what you did and I got some ,v and ,v,v files for some of the
original source files. This happened for some, but not all of the source
files.  I believe this is what happened. During the import CVS creates a
source control file (the file,v file) for each file being imported.
However, since you were creating the repository in the same directory as
where you were importing from, the CVS picked up some of the newly created
file,v files as source files that needed to be imported into the repository.
That resulted in the creation of the file,v,v files.  Why this did not keep
recursively picking up all of the ,v files and then the ,v,v files to create
,v,v,v files and so on is beyond me.

The good news is no data has been lost, at least in the test I performed.
You should be able to safely do a checkout like I describe above, then
delete all of the file,v files that you get as part of the checkout.  But
absolutely make sure you are doing this checkout test IN A NEW WORK
DIRECTORY, separate from any directory in the /home/johnwards/www path.
These file,v files you get as part of this checkout can be safely deleted,
because they were created as part of the recursive import that happened as I
describe above.  All they are is an import of a CVS file1,v file, which is
of no use to you.  You will also see the corresponding file1 file, which
is the source file you want.

After you do this checkout test and prune out the files,v files,
make sure you can still build your project, or whatever integrity
check you can perform over these files to insure they are in a good state.
Assuming that goes well, then start over, and create a new good repository.

You almost had it right.  From reading what you did, the only mistake
I can see that you made was setting your CVSROOT=/home/johnwards/www.
Do this instead, and you should be in good shape:

  mkdir /home/johnwards/cvsroot
  export CVSROOT=/home/johnwards/cvsroot
  cvs init
  cd /tmp/test_checkout
  cvs import -m SportNetwork first import sportnetwork vendor_tag release1


After you do this, you then need to checkout the source code you just
checked into CVS into a new, empty work area.  I'd do the following:

  cd /home/johnwards/www
  mv sportnetwork sportnetwork.saveme
  cvs co sportnetwork

Make sure you archive off and save /home/johnwards/www/sportnetwork.saveme,
just in case you need to go back to this mixed up work area to
recover any files.

I think you can recover from your original mistake, assuming you have
not panicked and done something in the interim that has made your original
mistake worse.

I hope some of what I have described above is helpful to you.  

Good luck,

Adam
---
Adam Bernstein   [EMAIL PROTECTED]   http://mpgedit.org/~number6


On Wed, 26 Nov 2003, David Wood wrote:

 I had the same thought, Steve, and I think the same concern - given what 
 he did, the repository _might_ have been a valid one the first time 
 through - and it might be a valid repository of the repository now. But 
 without knowing the nuts and bolts of the repository and import process, I 
 can think of reasons why it wouldn't be. 
 
 Of course, there's not much to lose in performing the experiment, as long 
 as you take care and keep copies of everything. I'll be curious to hear if 
 following these instructions would work.
 
 [EMAIL PROTECTED] wrote on 11/26/2003 
 02:46:10 PM:
 
  David,
  
  Perhaps John could try this?
  A suggestion to untangle:
  
  1. Create a repository properly.
  2. Copy the .v.v files into the repository manually.
  3. Checkout the files into a working directory. (getting a .v file)
  4. Copy the .v files manually into the repository.
  5. Checkout the files into a working directory. (hopefully getting back 
  the originals.)
  
  This assumes that the creating the repository over the original files 
  didn't muck them up too much.
  
  John,
  Don't just try the above suggestion till we get more input.  I'm just 
  floating an idea and I think the experts here might have something more 
  to say about it.
  
  Understanding how the repository is different from the working directory 
 
  is crucial.  A few clif notes:
  * You create a repository in an empty directory.  This repository is 
  separate and 

Re: Backtracking on Branch? Please Help!

2002-04-09 Thread Brian Sharpe


Phew
Its cool now.

All along it was because I had the 
'Get Clean Copy' item checked.

With this checked, I would always get a file 
from the main trunk.  It would seem to ignore
my current branch.

With it off, I could do an update -D 22 mar 2002
and it would just rollback my code to that date, and keep
on the current branch.

I still can't figure out why Get Clean Copy behaved in
this way, but thats another issue.

I'm back on track with my code.

Thanks Brian Poynor + Guys.
later
Brian Sharpe.


- Original Message - 
From: Brian Poynor [EMAIL PROTECTED]
To: Brian Sharpe [EMAIL PROTECTED]
Cc: [EMAIL PROTECTED]
Sent: Tuesday, April 09, 2002 1:40 PM
Subject: Re: Backtracking on Branch? Please Help!


 Can you checkout your branch at the specific date, tag it, and use
 that tag to backtrack the branch?
 
 e.g. cvs co -rbranch -jbranch -jtag ...
 
 -Brian
 
 On Tue, Apr 09, 2002 at 12:16:15AM +1200, Brian Sharpe wrote:
  Hi You Guys.
  
  Does anyone know how I can backtrack to a date on a branch?   
  
  I'm in a pickle right now...
  I've been working on a branch for a while, now
  I want to resort back to a date on that branch.
  But I find I can't backtrack to a date on a branch!!???
  
  I can only do it on the Main Trunk, which is not what I want.. ;-(
  
  I can kinda do it with revision numbers.
  But this is insanely tedious, even for 1 file.
  And I'm working on a project with about 600 files.  
  So this is not an option for me.
  
  
  please help?
  Thanks HEAPS guys
  
  
  Brian Sharpe.
  Pandromeda.
  www.pandromeda.com
  [EMAIL PROTECTED] 
 



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Backtracking on Branch? Please Help!

2002-04-08 Thread Brian Sharpe



Hi You Guys.Does anyone know how I can backtrack to a date on a 
branch?I'm in a pickle right now...I've been 
working on a branch for a while, nowI want to resort back to a date on that 
branch.But I find I can't backtrack to a date on a branch!!???
I can only do it on the Main Trunk, which is not what I want.. 
;-(
I can kinda do it with revision numbers.But this is insanely tedious, 
even for 1 file.And I'm working on a project with about600 files. 

So this is not an option for me.please help?Thanks HEAPS 
guys
Brian Sharpe.Pandromeda.www.pandromeda.com[EMAIL PROTECTED] 



Re: Backtracking on Branch? Please Help!

2002-04-08 Thread Brian Poynor

Can you checkout your branch at the specific date, tag it, and use
that tag to backtrack the branch?

e.g. cvs co -rbranch -jbranch -jtag ...

-Brian

On Tue, Apr 09, 2002 at 12:16:15AM +1200, Brian Sharpe wrote:
 Hi You Guys.
 
 Does anyone know how I can backtrack to a date on a branch?   
 
 I'm in a pickle right now...
 I've been working on a branch for a while, now
 I want to resort back to a date on that branch.
 But I find I can't backtrack to a date on a branch!!???
 
 I can only do it on the Main Trunk, which is not what I want.. ;-(
 
 I can kinda do it with revision numbers.
 But this is insanely tedious, even for 1 file.
 And I'm working on a project with about 600 files.  
 So this is not an option for me.
 
 
 please help?
 Thanks HEAPS guys
 
 
 Brian Sharpe.
 Pandromeda.
 www.pandromeda.com
 [EMAIL PROTECTED] 

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: Backtracking on Branch? Please Help!

2002-04-08 Thread Brian Sharpe


Hi Brian.

Thank you for your reply.

ok... I'm having more success with the -j option.
It seems to have to require another state to have to merge with tho
I can't simply checkout the branch+date that I want.

I tried a few tricks such as...

cvs checkout -j MyBranch:22 mar 2002 -j MyBranch:22 mar 2002 MyModule
and...
cvs checkout -j MyBranch:22 mar 2002 -j MyBranch:23 mar 2002 MyModule

but both ended up giving me the main trunk again.


Would it work if I merged my Branch+Date state with the MainTrunk files for
when
I created my branch.
eg created branch at 10th Oct 2001.

so..
cvs checkout -D 10 oct 2001 -j MyBranch:23 mar 2002 MyModule

If this is true.
How can I find out when a branch was made?
I had a hunt for that in faq's/doc's but all I could find was a post where
someone said you couln't get the date back for when a branch was made!
OhNo!  another stumbling block?


Thanks ALOT for this help.
much appreciated.
later
Brian Sharpe.



- Original Message -
From: Brian Poynor [EMAIL PROTECTED]
To: Brian Sharpe [EMAIL PROTECTED]
Cc: [EMAIL PROTECTED]
Sent: Tuesday, April 09, 2002 1:40 PM
Subject: Re: Backtracking on Branch? Please Help!


 Can you checkout your branch at the specific date, tag it, and use
 that tag to backtrack the branch?

 e.g. cvs co -rbranch -jbranch -jtag ...

 -Brian

 On Tue, Apr 09, 2002 at 12:16:15AM +1200, Brian Sharpe wrote:
  Hi You Guys.
 
  Does anyone know how I can backtrack to a date on a branch?
 
  I'm in a pickle right now...
  I've been working on a branch for a while, now
  I want to resort back to a date on that branch.
  But I find I can't backtrack to a date on a branch!!???
 
  I can only do it on the Main Trunk, which is not what I want.. ;-(
 
  I can kinda do it with revision numbers.
  But this is insanely tedious, even for 1 file.
  And I'm working on a project with about 600 files.
  So this is not an option for me.
 
 
  please help?
  Thanks HEAPS guys
 
 
  Brian Sharpe.
  Pandromeda.
  www.pandromeda.com
  [EMAIL PROTECTED]




___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: cvs problem with modules, please help!

2002-03-13 Thread Swapnilp

If you can describe in detail, what You are trying to do, then that
will be helpful. Since If you check the help of -d option. it says the
module will go into the directory, instead of the module name.

For example
module -d dir
is place module in the directory dir instead of module

Please specify the purpose.

Swapnil

[EMAIL PROTECTED] (Sergey Malov) wrote in message 
news:[EMAIL PROTECTED]...
 [EMAIL PROTECTED] (Eugene Katzman) wrote in message 
news:[EMAIL PROTECTED]...
  [EMAIL PROTECTED] (Sergey Malov) wrote in message 
news:[EMAIL PROTECTED]...
   I found the following addition to the CVS's modules file doesn't
   work as it suppose, according to some posts whcih I've seen in this
   group
   
   foo -d . proj1/subproj1 file1.pl
   
   where $CVSROOT/proj1/subproj1/file1.pl does exists.
   
   When I'm trying to checkout file1.pl, I'm getting message:
   cvs server: existing repository /home/users/cvs/CVSROOT doesn't match
   /home/users/cvs/CVSROOT/proj1/subproj1
   cvs server: ignoring module foo
   
   I'm  sure that /home/users/cvs/CVSROOT/proj1/subproj1 does exists with
   the forementioned file. I'm sure that CVSROOT points to correct place
   and work for other modules.
  
  Have you checked out the directory structure, ie Subproj1 with its
  accompanying directories.  Is there a CVSROOT directory in the
  repository and does it have the files which would have been created
  when an init command was performed.
 
 Yes, CVSROOT exists and has all the needed files. Tree
 proj1/subproj1 also exists and has all the files which need.
 
 Greg Woods mentioned, however, that construction which I'm trying to
 use:
 foo -d . proj1/subproj1 file1.pl is illegal in CVS and if it is
 indeed the case, I understand why error message shows up.
 
 Sergey Malov
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: Please help with merge!!!!!

2002-03-09 Thread Andy Mayer

On Sat, 09 Mar 2002 03:57:05 +, Stephen Leake wrote:

 I don't think CVS can do that. You are talking about managing change
 sets.

Then what is chapter 13 of the CVS manual all about? It says there If you
modify a program to better fit your site, you probably want to include
your modifications when the next release of the program arrives. CVS can
help you with this task. 

 I handle this process by keeping a diff file of my changes to vendor's
 code, and applying it to each new release (outside of CVS).

Could you please explain this process a little more?

Thanks,

Andy
---
www.andymayer.com
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: Please help with merge!!!!!

2002-03-09 Thread Stephen Leake

Andy Mayer [EMAIL PROTECTED] writes:

 On Sat, 09 Mar 2002 03:57:05 +, Stephen Leake wrote:
 
  I don't think CVS can do that. You are talking about managing change
  sets.
 
 Then what is chapter 13 of the CVS manual all about? It says there If you
 modify a program to better fit your site, you probably want to include
 your modifications when the next release of the program arrives. CVS can
 help you with this task. 

Good. Learn something new every day :). I think that chapter wasn't
there the first time I read the CVS manual (getting longer ago every
day :).

I'll have to try this.

  I handle this process by keeping a diff file of my changes to
  vendor's code, and applying it to each new release (outside of
  CVS).
 
 Could you please explain this process a little more?

Well, I think I'm just doing manually what CVS does with branches and
merging.

Here's the process:

1) Unpack the vendor's version 1.0 distribution twice; one clean
   copy, one I will modify.

2) Make my modifications.

3) Run 'diff' to get a single diff file showing all my modifications.

Now, when Vendor version 2.0 comes along:

1) Unpack Vendor version 2.0 twice.

2) Run 'patch' to apply my version 1.0 changes to version 2.0.

3) Make more changes.

4) Run 'diff' to make a version 2.0 patch file.


This process is simpler than CVS when the vendor package is huge and
my local changes are small - a typical situation.

-- 
-- Stephe
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: Please help with merge!!!!!

2002-03-09 Thread Larry Jones

Andy Mayer writes:
 
 Problem: I want to merge the vendor's new release (R2) with my
 customisations to the previous release (R1).

To do that, you have to have the vendor's previous release (unmodified!)
in your repository, preferably on the vendor branch.  Please read the
Tracking third-party sources part of the manual:

http://www.cvshome.org/docs/manual/cvs_13.html#SEC104

-Larry Jones

The authorities are trying to silence any view contrary to their own!
-- Calvin

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: Please help with merge!!!!!

2002-03-09 Thread Larry Jones

Stephen Leake writes:
 
 Here's the process:
 
 1) Unpack the vendor's version 1.0 distribution twice; one clean
copy, one I will modify.
 
 2) Make my modifications.
 
 3) Run 'diff' to get a single diff file showing all my modifications.
 
 Now, when Vendor version 2.0 comes along:
 
 1) Unpack Vendor version 2.0 twice.
 
 2) Run 'patch' to apply my version 1.0 changes to version 2.0.
 
 3) Make more changes.
 
 4) Run 'diff' to make a version 2.0 patch file.
 
 This process is simpler than CVS when the vendor package is huge and
 my local changes are small - a typical situation.

You must have a strange definition of simpler.  If you're completely
unfamiliar with CVS's vendor branch support (which it seems you are),
then your process may well be more familiar or easier for you, but it
most definitely isn't simpler.

-Larry Jones

Mom would be a lot more fun if she was a little more gullible. -- Calvin

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: Please help with merge!!!!!

2002-03-09 Thread Wim Kerkhoff

Larry Jones wrote:
 
 Stephen Leake writes:
 
  Here's the process:
 
  1) Unpack the vendor's version 1.0 distribution twice; one clean
 copy, one I will modify.
 
  2) Make my modifications.
 
  3) Run 'diff' to get a single diff file showing all my modifications.
 
  Now, when Vendor version 2.0 comes along:
 
  1) Unpack Vendor version 2.0 twice.
 
  2) Run 'patch' to apply my version 1.0 changes to version 2.0.
 
  3) Make more changes.
 
  4) Run 'diff' to make a version 2.0 patch file.
 
  This process is simpler than CVS when the vendor package is huge and
  my local changes are small - a typical situation.
 
 You must have a strange definition of simpler.  If you're completely
 unfamiliar with CVS's vendor branch support (which it seems you are),
 then your process may well be more familiar or easier for you, but it
 most definitely isn't simpler.

Hmm... I've been doing something similiar to what Stephen is/has been
doing. That is, I store the vendor tarball (vendor-x.y.tar.gz), my patch
of changes, and a build-vendor.sh script that takes the tarball,
extracts, patches, configures, compiles, builds, and does whatever else
is necessary. This works, is automated, and both the patch are build
script are under revision control. Generally, our changes to vendor
source are quite small, and easily port to the next vendor version.
However, there are occasions where we make major changes.

I just read the section on vendor branches in the CVS book. It looks
like it could be a lot simpler; I prefer having inline conflicts rather
than a bunch of */*/*.rej files.

For smaller vendor sources, I can see that it will take less space in
the CVS repository when importing the sources, rather then the tarballs.
However, for something big (like the Linux kernel sources) I'd rather
import a 15MB .tar.bz2 file then the extracted sources (110MB).
Especially as we have very few modifications to it, and build-kernel.sh
takes care of applying various patches to it...

-- 

Regards,

Wim Kerkhoff, Software Engineer
Merilus, Inc.  -|- http://www.merilus.com
Email: [EMAIL PROTECTED]

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



please help me

2002-03-08 Thread Javed

Hello,
   I am new to cvs but not new to programming in
general. I am working on a software in which i need to
to be able to see a version of a file - which is
stored in cvs -, as it existed on a particular date
and time. And to access the file i dont want to
checkout a complete module.
Please help.
Thanx,
Javed.


__
Do You Yahoo!?
Try FREE Yahoo! Mail - the world's greatest free email!
http://mail.yahoo.com/

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: please help me

2002-03-08 Thread Matt Riechers

Javed wrote:
 
 Hello,
I am new to cvs but not new to programming in
 general. I am working on a software in which i need to
 to be able to see a version of a file - which is
 stored in cvs -, as it existed on a particular date
 and time. And to access the file i dont want to
 checkout a complete module.

You can checkout a file by giving its full path in the repository:

cvs co path/to/file

If you want to look at a particular revision, use the -r/-D options.

See the manual for details: http://www.cvshome.org/docs/manual/

-Matt

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Please help with merge!!!!!

2002-03-08 Thread Andy Mayer

Hi,

Problem: I want to merge the vendor's new release (R2) with my
customisations to the previous release (R1).

So first I create a branch for the vendor's new release and commit his
changes to my repository as follows:

$ cd module-name
$ cvs tag -b vendors-R2-branch
$ mv /path/to/R2 *
$ cvs commit -m New release R2

And then I merge this new branch to the main branch as follows:

$ rm -Rf module-name  # create clean working copy 
$ cvs checkout module-name
$ cd module-name
$ cvs update -kk -j vendors-R2-branch

All the changes now appear merged okay in my working directory, but my
first lot of changes to R1 in the main branch have all been changed back
to what they where originally in R1 (ie. the vendor's coding)!!

How do I make CVS keep my original changes to R1, but take the vendor's
new changes to R2?

Thanks,

Andy
---
www.andymayer.com
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: Please help with merge!!!!!

2002-03-08 Thread Stephen Leake

Andy Mayer [EMAIL PROTECTED] writes:

 Hi,
 
 Problem: I want to merge the vendor's new release (R2) with my
 customisations to the previous release (R1).
 
 snip
 How do I make CVS keep my original changes to R1, but take the vendor's
 new changes to R2?

I don't think CVS can do that. You are talking about managing change
sets. 

I handle this process by keeping a diff file of my changes to vendor's
code, and applying it to each new release (outside of CVS).

-- 
-- Stephe
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



WinCVS remote repository, please help before I...

2002-03-06 Thread sharkfish

lose my mind.

I'm just trying to set up WinCVS on an Win2K machine.

My files are accessible via an IP or domain name, and not connected
via LAN at all.  They are viewable on the internet, and this is my
test server.

I want to check files out and see changes as I make them.

So...

I need to know how to tell WinCVS where to look for my files.

Next, I need to get WinCVS to see my files properly.  They say 'nonCVS
files' now.

What is a module?  Is there a step by step instruction manual that is
CLEAR?  I'm confused about the way I'm supposed to indicate my server
to connect to...why can't I just use www.mydomain.com?

How can I get WinCVS to see my files properly?
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: WinCVS remote repository, please help before I...

2002-03-06 Thread Rob Helmer

On Wed, Mar 06, 2002 at 04:14:19PM -0800, sharkfish wrote:
 I need to know how to tell WinCVS where to look for my files.
 
 Next, I need to get WinCVS to see my files properly.  They say 'nonCVS
 files' now.
 
 What is a module?  Is there a step by step instruction manual that is
 CLEAR?  I'm confused about the way I'm supposed to indicate my server
 to connect to...why can't I just use www.mydomain.com?
 
 How can I get WinCVS to see my files properly?

Hello,


It sounds like what you need to do is set up a CVS repository.

A repository holds modules, modules are essentially a directory ( aka
folder ) inside a CVS repository.

The files that are kept inside a module are special version control
files, you have to use CVS to get a particular version of a particular
file. If you have these version control files available to the internet
they will not be useful to anyone without CVS installed.

It sounds to me like you need to set up a CVS repository ( look
at www.cvsnt.org if you don't have a Unix server available to you ).
There you can download the peice of CVS that acts as a server,
WinCVS will be your client. It doesn't matter if these two peices
are on the same machine or not.

Do you want to use CVS to keep your website under version control?
You can use www.mydomain.com as your server, but you will need
to have some method of releasing some version of the files under
version control.

This can be as simple as a script ( batch file, shell, perl, whatever )
that does something like :

cd \www
cvs export module

Where \www is where your webserver keeps it's content, and
module is the module you create in CVS.

You can make it alot more complex and useful, by assigning
release tags and automating releases and such, but you should
probably get the CVS repository running correctly before you
dive into all the other things you can do with version control
and release management.



Hope that helps,
Rob Helmer

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: cvs problem with modules, please help!

2002-02-25 Thread Eugene Katzman

[EMAIL PROTECTED] (Sergey Malov) wrote in message 
news:[EMAIL PROTECTED]...
 I found the following addition to the CVS's modules file doesn't
 work as it suppose, according to some posts whcih I've seen in this
 group
 
 foo -d . proj1/subproj1 file1.pl
 
 where $CVSROOT/proj1/subproj1/file1.pl does exists.
 
 When I'm trying to checkout file1.pl, I'm getting message:
 cvs server: existing repository /home/users/cvs/CVSROOT doesn't match
 /home/users/cvs/CVSROOT/proj1/subproj1
 cvs server: ignoring module foo
 
 I'm  sure that /home/users/cvs/CVSROOT/proj1/subproj1 does exists with
 the forementioned file. I'm sure that CVSROOT points to correct place
 and work for other modules.
 
 I'm not going to use the above mentioned line by itself, it's part of
 building
 some complex module.
 
 I use cvs 1.9.28 on Solaris 8.
 
 I would greatly appreciate any help, because I'm stuck.
 
 Thanks,

 
 Sergey Malov

Have you checked out the directory structure, ie Subproj1 with its
accompanying directories.  Is there a CVSROOT directory in the
repository and does it have the files which would have been created
when an init command was performed.

The files that should be there include checkoutlist, commitinfo,
config,
cvswrappers, editinfo, history, loginfo and other files.
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



modifying CVS modules file, please, help

2002-02-25 Thread Sergey Malov

Thanks for response on my previous e-mail, regarding using sctructure 
foo -d . proj1/subproj1 file1.pl in modules file. I found this
advice, incidently, on the site CVS bubble,
http://www.loria.fr/~molli/fom-serve/cache/29.html.

My main problem is the following. To build a package, I need to create
directory structure, which has, among others, directory
package/scripts. This directory has to have files from the different
directories in repository, namely

  all files from the directory proj1/scripts
  files a.pm, b.pm from the directory proj2/subdir2/perl
  files c.sh, d.sh from the directory proj3/misc

I would like to be able to update package/scripts directory in one
pass and be able to commit a.pm, b.pm, c.sh, and d.sh back to
repository. Other developers has a strong feeling that all the
forementioned files have to stay in repository where they are.

Is there a way to accomplish all of this with the use of modules file?
If no, how to solve this problem gracefully?

Thanks

Sergey Malov
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: cvs problem with modules, please help!

2002-02-25 Thread Steve Greenland

On Fri, Feb 22, 2002 at 04:01:24PM -0500, Greg A. Woods wrote:
 You can't use -d . -- you must specify a directory name other than '.'
 
 (you can't use .. in the name either, and I don't believe a
 sub-directory is legal either -- i.e. no relative pathnames, just a
 basic simple directory name)

Actually, this works fine:

foo -d fred/barney my/module/path

Or is that not whay you meant relative pathname?

Steve

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: modifying CVS modules file, please, help

2002-02-25 Thread Eric Siegerman

On Mon, Feb 25, 2002 at 07:42:09AM -0800, Sergey Malov wrote:
 My main problem is the following. To build a package, I need to create
 directory structure, which has, among others, directory
 package/scripts. This directory has to have files from the different
 directories in repository, namely
 
   all files from the directory proj1/scripts
   files a.pm, b.pm from the directory proj2/subdir2/perl
   files c.sh, d.sh from the directory proj3/misc
 
 I would like to be able to update package/scripts directory in one
 pass and be able to commit a.pm, b.pm, c.sh, and d.sh back to
 repository.

CVS simply CANNOT do this, with the modules file or any other
way; the data structures don't support it.  The file
package/scripts/CVS/Repository has to contain the pathname of the
directory within the repo where the ,v files live, and it can
only contain one pathname.

You'll have to find another way.  Here are some possibilities;
there may be others:
 1. Use a Makefile, shell script, etc. to copy the files into
package/scripts after checkout.

 2. Instead of copying the files, create symlinks in
package/scripts, pointing to the files' checked-out locations
in proj1/scripts etc.  This still requires a Makefile or
whatever, but has a big advantage over copying: people can
edit package/scripts/c.sh and not have to worry about copying
the modified file back to proj3/misc, since it's already
there :-)

 3. Reorganize the repo.

 4. Modify CVS.  This is almost certainly the most difficult, but
(if your changes are accepted by the CVS maintainers) it'll
solve the problem for good.

--

|  | /\
|-_|/ Eric Siegerman, Toronto, Ont.[EMAIL PROTECTED]
|  |  /
One ring to rule the mall.
- Movie review headline, eye Magazine

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: cvs problem with modules, please help!

2002-02-25 Thread Sergey Malov

[EMAIL PROTECTED] (Eugene Katzman) wrote in message 
news:[EMAIL PROTECTED]...
 [EMAIL PROTECTED] (Sergey Malov) wrote in message 
news:[EMAIL PROTECTED]...
  I found the following addition to the CVS's modules file doesn't
  work as it suppose, according to some posts whcih I've seen in this
  group
  
  foo -d . proj1/subproj1 file1.pl
  
  where $CVSROOT/proj1/subproj1/file1.pl does exists.
  
  When I'm trying to checkout file1.pl, I'm getting message:
  cvs server: existing repository /home/users/cvs/CVSROOT doesn't match
  /home/users/cvs/CVSROOT/proj1/subproj1
  cvs server: ignoring module foo
  
  I'm  sure that /home/users/cvs/CVSROOT/proj1/subproj1 does exists with
  the forementioned file. I'm sure that CVSROOT points to correct place
  and work for other modules.
 
 Have you checked out the directory structure, ie Subproj1 with its
 accompanying directories.  Is there a CVSROOT directory in the
 repository and does it have the files which would have been created
 when an init command was performed.

Yes, CVSROOT exists and has all the needed files. Tree
proj1/subproj1 also exists and has all the files which need.

Greg Woods mentioned, however, that construction which I'm trying to
use:
foo -d . proj1/subproj1 file1.pl is illegal in CVS and if it is
indeed the case, I understand why error message shows up.

Sergey Malov
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



cvs problem with modules, please help!

2002-02-22 Thread Sergey Malov

I found the following addition to the CVS's modules file doesn't
work as it suppose, according to some posts whcih I've seen in this
group

foo -d . proj1/subproj1 file1.pl

where $CVSROOT/proj1/subproj1/file1.pl does exists.

When I'm trying to checkout file1.pl, I'm getting message:
cvs server: existing repository /home/users/cvs/CVSROOT doesn't match
/home/users/cvs/CVSROOT/proj1/subproj1
cvs server: ignoring module foo

I'm  sure that /home/users/cvs/CVSROOT/proj1/subproj1 does exists with
the forementioned file. I'm sure that CVSROOT points to correct place
and work for other modules.

I'm not going to use the above mentioned line by itself, it's part of
building
some complex module.

I use cvs 1.9.28 on Solaris 8.

I would greatly appreciate any help, because I'm stuck.

Thanks,

Sergey Malov
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: cvs problem with modules, please help!

2002-02-22 Thread Larry Jones

Sergey Malov writes:
 
 When I'm trying to checkout file1.pl, I'm getting message:
 cvs server: existing repository /home/users/cvs/CVSROOT doesn't match
 /home/users/cvs/CVSROOT/proj1/subproj1
 cvs server: ignoring module foo

That implies that you're trying to checkout files from different
repository directories into the same working directory.  CVS doesn't
allow that.

-Larry Jones

Fortunately, that was our plan from the start. -- Calvin

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: cvs problem with modules, please help!

2002-02-22 Thread Greg A. Woods

[ On , February 22, 2002 at 10:23:51 (-0800), Sergey Malov wrote: ]
 Subject: cvs problem with modules, please help!

 I found the following addition to the CVS's modules file doesn't
 work as it suppose, according to some posts whcih I've seen in this
 group
 
 foo -d . proj1/subproj1 file1.pl

You can't use -d . -- you must specify a directory name other than '.'

(you can't use .. in the name either, and I don't believe a
sub-directory is legal either -- i.e. no relative pathnames, just a
basic simple directory name)

Where did you get the idea that you could use '.'?  Wherever such a
suggestion is it should be corrected A.S.A.P.

-- 
Greg A. Woods

+1 416 218-0098;  [EMAIL PROTECTED];  [EMAIL PROTECTED];  [EMAIL PROTECTED]
Planix, Inc. [EMAIL PROTECTED]; VE3TCP; Secrets of the Weird [EMAIL PROTECTED]

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



please help with cvsgraph setup

2002-01-23 Thread Mark

I am hoping someone here can help. I am trying to compile cvsgraph for
inclusion with ViewCVS. Environment is Solaris Workshop 6.1, Solaris 2.6,
Python2.2, Apache 1.3 or so.

I have compiled and installed the needed libraries (at the same --prefix=):
-GD libraries (libgd.a) which need:
 - jpeg-v6 (libjpeg.a)
 - zlib (lz.a)
 - Png (libpng.a)

I try to compile cvsgraph (even specifying the lib path and include path
options for each of the 4 libraries to the configure script), but configure
doesn't find (but completes)
- checking for gdImageGif ... no
- checking for gdImagePng  no
- checking for gdImageJpeg ... no

then make fails because
error No image output format available. Check libgd

If you have any suggestions/solutions, please let me know.

Thanks


__
Do You Yahoo!?
Send FREE video emails in Yahoo! Mail!
http://promo.yahoo.com/videomail/

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Why can't commit file on the case?Please help me!

2002-01-22 Thread George xu



Hello all:
 I has a file setup.ini in work directory 
.and The setup.ini file current version is 1.2 . Now I want to back to version 
1.1.1.1 then modifiy the setup.ini file and commit it.But I can't do 
it.

I using wincvs1.2 on win2000 and CVSNT server 
on win2000 server.

My step:
Step 1.
cvs update -r 1.1.1.1 SETUP.INI (in directory 
C:\work\)U SETUP.INI

*CVS exited normally with code 
0*
Step 2.
cvs edit SETUP.INI (in directory 
C:\work\)

*CVS exited normally with code 
0*

Step 3. I modified the 
setup.ini file and saved it.

Step 4.
cvs update SETUP.INI (in directory C:\work\)M 
SETUP.INI

*CVS exited normally with code 
0*

Step 5.
cvs commit -m "no message" SETUP.INI (in directory 
C:\work\)cvs [commit aborted]: end of file from server (consult above 
messages if any)

*CVS exited normally with code 
1*


These message meaning can't commit to 
server.
Why?

Howdo I should ?

Thank you!



Re: Why can't commit file on the case?Please help me!

2002-01-22 Thread Larry Jones

George xu writes:
 
   I has a file setup.ini in work directory .and The setup.ini file
 current version is 1.2 . Now I want to back to version 1.1.1.1 then
 modifiy the setup.ini file and commit it.But I can't do it.

No, you can't.  But you can overwrite the current version and then
commit it:

cvs update -A setup.ini
cvs update -r 1.1.1.1 -p setup.ini setup.ini
cvs commit setup.ini

-Larry Jones

He doesn't complain, but his self-righteousness sure gets on my nerves.
-- Calvin

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: Please help me arrange my development environment

2002-01-17 Thread Preston Crawford

In article [EMAIL PROTECTED], Jesus Manuel NAVARRO LOPEZ wrote:
 But this, of course, are problems you already know for they already 
 appear when using frontpage/VSS (well, that's why even frontpage server 
 can be managed to work locally -for development, and then sync with a 
 remote server... just to discover you have deleted the last change your 
 mate did but you didn't noticed, so you didn't updated your local site 
 with the changes).

I know what you mean. Much good stuff snipped, btw, and thanks for the 
thoughtful response. I don't think I came across a lot of these 
centralized development issues with frontpageSE/VSS because I've largely 
worked at small companies or two-man teams. That's why this is a leap for 
me, to think about the distributed development web servers, because that's 
just not what I'm used to. But after talking to you and others, you've 
really set me straight. I see how it should be done, and more than that 
it makes more sense when I really think about it. Especially because there 
are times (even though it's been a while since I've been in a team so I 
don't remember them) when you step on each other's work by breaking code. 

Anyway. Thanks for your help.

Preston
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Please help me arrange my development environment

2002-01-16 Thread Preston Crawford


My company is switching to iPlanet web servers and I've been trying (as 
indicated by other posts) to put together a relatively inexpensive 
development environment including source control for JSP/Java web 
development.

I'm trying to decide how I should setup my development web server. The 
model I've seen used so far with CVS is to setup a local web server 
(Tomcat, JRun, etc.) and to use CVS to download source into the local 
directories, develop, and then check in the code when done.

The model I'm used to working in (using Visual Interdev/ASP/Visual Source 
Safe) is one where you do development using FrontPage Server extensions 
against a remote server AND source store. So what I'm struggling with is 
how exactly CVS can and should be used in devising my environment here. 

Given what I've said earlier about my understanding of how you use CVS, 
especially for web development, is there any reason to believe I should be 
using it in a manner *similar* to how I'm used to working, with a single 
development web server and workstations working against that machine?

I'm just making sure before I finally decide. It seems to me that the way 
CVS operates (non-locking) and given that we don't have something like 
FP Server Extensions to integrate source control with the development 
web server, making both accessible to the IDE, that it's best to work with 
separate light java web servers running locally and the CVS code being 
checked out into local directories.

I hope that made sense. If it didn't I'll trying to clarify, but either 
way I'd appreciate some help so I can get my development environment 
nailed down.

Preston
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: Please help me arrange my development environment

2002-01-16 Thread Chris Smith

Preston Crawford wrote ...
 I'm trying to decide how I should setup my development web server. The 
 model I've seen used so far with CVS is to setup a local web server 
 (Tomcat, JRun, etc.) and to use CVS to download source into the local 
 directories, develop, and then check in the code when done.
 
 The model I'm used to working in (using Visual Interdev/ASP/Visual Source 
 Safe) is one where you do development using FrontPage Server extensions 
 against a remote server AND source store. So what I'm struggling with is 
 how exactly CVS can and should be used in devising my environment here. 
 
 Given what I've said earlier about my understanding of how you use CVS, 
 especially for web development, is there any reason to believe I should be 
 using it in a manner *similar* to how I'm used to working, with a single 
 development web server and workstations working against that machine?

Depends on how you're planning on using CVS.  If the goal of your source 
control is to make it possible for multiple people to work simultaneously 
on different modifications to the source, then using a single development 
server for testing rather defeats those gains.  If, on the other hand, 
you only have one or a very few developers who communicate intensely 
outside of the source control, your more familiar model could be workable 
and could keep down installation maintenance headaches.

You will, of course, want a separate system for integration testing on 
any project of reasonably large size.  This would be separate from any of 
the developers' machines, and would be used for regression testing to be 
sure that multiple developers don't make changes that logically conflict 
(which is still quite possible with any source control system).

Chris Smith
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: Please help me arrange my development environment

2002-01-16 Thread Preston Crawford

On Tue, 15 Jan 2002 17:38:49 -0800, Chris Smith wrote:

 Depends on how you're planning on using CVS.  If the goal of your source
 control is to make it possible for multiple people to work
 simultaneously on different modifications to the source, then using a
 single development server for testing rather defeats those gains.  If,
 on the other hand, you only have one or a very few developers who
 communicate intensely outside of the source control, your more familiar
 model could be workable and could keep down installation maintenance
 headaches.
 

The way I plan on using it in the short term is for me to develop and to
keep track of my source so I can version, rollback, etc. I will be the
only developer. But we're bringing at least one person on shortly and
maybe more in the future, so what I'm trying to do in part is get a feel
for how it's done in the Java world and the CVS world, by and large.
Because, as I stated, the absence of something like FrontPage Server
Extensions seems to prevent the creation of an environment where there is
a centralized development server like this. The only way you could
seemingly do that with CVS would be to ssh into the server and CVS down.
And even in that situation it seems to me like you'd be talking multiple
instances or  hosts on the web server.

 You will, of course, want a separate system for integration testing on
 any project of reasonably large size.  This would be separate from any
 of the developers' machines, and would be used for regression testing to
 be sure that multiple developers don't make changes that logically
 conflict (which is still quite possible with any source control system).
 
 Chris Smith

Thanks for the advice. So how is it done out there, then? It sounds like
local development on a local web server, pitching your source up to a
central CVS repository is the way to go. I think in a way I might confuse
things by bringing up CVS, when the real issue has to do with distributed
web development in a world where a system like FrontPage (keeping aware
that there are MANY problems with FPSE obviouslY) Server Extensions,
Interdev and SourceSafe aren't as usable.

Preston
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: Please help me arrange my development environment

2002-01-16 Thread Steve Greenland

On Wed, Jan 16, 2002 at 05:11:44AM +, Preston Crawford wrote:
 Because, as I stated, the absence of something like FrontPage Server
 Extensions seems to prevent the creation of an environment where there is
 a centralized development server like this. The only way you could
 seemingly do that with CVS would be to ssh into the server and CVS down.
 And even in that situation it seems to me like you'd be talking multiple
 instances or  hosts on the web server.

With apache, one can run virtual servers -- same apache installation,
same (mostly) config, just different documents, like this:

http://dev01.some.domeain/ - /webdev/dev01
http://dev02.some.domeain/ - /webdev/dev02
http://dev03.some.domeain/ - /webdev/dev03

(And you make your DNS resolve all of the above to the same ip, or use
ip aliasing, or whatever works for your particular situation.)


Then each developer has her own sandbox, w/o having to run multiple
webservers. I don't know if iPlanet can do this...

Just for ideas, here's some links about how others have done web
development using CVS:

http://www.durak.org/cvswebsites/howto-cvs/
http://philip.greenspun.com/wtr/cvs.html
 
Steve

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: Please help me arrange my development environment

2002-01-16 Thread Jesus Manuel NAVARRO LOPEZ

Hi, Preston:

Preston Crawford wrote:

 On Tue, 15 Jan 2002 17:38:49 -0800, Chris Smith wrote:
 
 
Depends on how you're planning on using CVS.  


[...]



 
 The way I plan on using it in the short term is for me to develop and to
 keep track of my source so I can version, rollback, etc. I will be the
 only developer. But we're bringing at least one person on shortly and


Under these circumnstances it really doesn't matter how you do it: being 
the single developer it would just work the same *if* your transparently 
access to the remote machine... provided you didn't know in advance or 
look the output of some command how can you tell (cualitatively, it 
migth be a bit slower) if your developing space is local or remote?
(more on this later)


 maybe more in the future, so what I'm trying to do in part is get a feel
 for how it's done in the Java world and the CVS world, by and large.


First of all I would say that Chris has put you on the rigth track.  On 
the long run the each developer works on his own copy on his own box 
will pay the most; the single box model is (on most cases, but not all 
of them) just crap due to misunderstunding things or misworking software.
With this in mind, it is true that specially in the begining assuring 
each box is properly configured can pose a heavier load on the sysadmin 
side than if the only box which works properly (regarding your project) 
is only one central server.  But you say you have just one developer, so 
you just have to take care of two boxes you already know well (server 
and yours), and future additions will be on a low pace so you will be 
able to cope with them.


 Because, as I stated, the absence of something like FrontPage Server
 Extensions seems to prevent the creation of an environment where there is
 a centralized development server like this. The only way you could
 seemingly do that with CVS would be to ssh into the server and CVS down.
 And even in that situation it seems to me like you'd be talking multiple
 instances or  hosts on the web server.
 


As I told you I prefer by far the

each developer works on his own copy on his own box.   Anyway it can be done the way 
you tell, at least if all developers are on the same LAN.

On the other hand, the centralized approach only works well when all 
developers are on the same LAN too (while it *can* work... more or less 
even through the Internet).

The point here is what I stated earlier: if you can find a way to 
function transparently:

You configure your iPlanet so it publishes from, let's say 
/usr/local/htdocs/ProjectX, so you make it to be a sandbox from the 
ProjectX module from the CVS repo.
Then your developers remote-mount /usr/local/htdocs/ProjectX as it 
locally fits (let's say D:\ local disk if they use some Win flavour 
using Samba to export it from the server or as /projects/ProjectX if 
using Un*x through NFS).
They install and properly configure CVS for remote access (using 
pserver, rsh, ssh or whatever fits).
Finally, they just launch their IDEs and that's all: They alter files 
and since they are working on a CVS sandbox any of them can remotely 
checkin the changes at leisure.
That's all.
Well that's not all.  You soon will find why the centralized approach 
doesn't pay: as soon as two developers try to edit the same file, or as 
soon as the additions/modifications from one developer break the whole 
app (and I don't mean *by mistake*: if a change needs to expand more 
than a file it's most than probable that the app breaks as soon as the 
first file's changes to the time when the last file is fixed and saved). 
  During this time frame is more than probably that the other members of 
the development team will have no option but to wait hand on hand till 
their mate ends his work.  These are the most common problems.  But on 
given time some of them will need to try something on his own, or you 
will want to try something that you don't know in advance if it will 
work or will end up on the main devel line, or just will span more than 
a few days and you will find you are, for instance, working on the next 
version of your app when one client needs some modification or bugfix on 
the currently in production.  Then you will need to publish not only one 
  version of your site but two/three/four (something like 
production.myapp.com, nextrelease.myapp.com willthiswork.myapp.com, or 
www.myapp.com:80 -for currently in production, www.myapp.com:8080 -next 
release, www.myapp.com:8081 that bugfix my client urgently needs...)
But this, of course, are problems you already know for they already 
appear when using frontpage/VSS (well, that's why even frontpage server 
can be managed to work locally -for development, and then sync with a 
remote server... just to discover you have deleted the last change your 
mate did but you didn't noticed, so you didn't updated your local site 
with the changes).


 
You will, of course, want a separate system for integration testing on

Newbie : please help me to migrate from RCS to CVS

2002-01-11 Thread Patrick FRADIN

Hi,

I'm working with RCS since 4 years ago and our software director want to 
migrate to CVS for many reasons.

Now, we have many TclTk applications derived from a main framework base. 
i.e. we have a framework tcltk RCS directory with common classes.

Each new application is derived from this common base by linking 
framework classes (xxx.tcl,v files) into application directory.

So, when we update a framework class, all applications are updated with 
simple co command...

How can I reproduce this architecture with CVS please ?

I create two samples modules in my repository to make test : one for the 
framework and the other for a test application. To do this I use import 
command.

But I can't checkout these two modules into the same working directory ! 
I have some error messages. I don't want to use links into working 
directory because some developpers works under Windows and others under 
Linux. I know Windows don't manage very well links.

Please, have you a suggestion or policy ?

Thanks in advance.

Patrick Fradin

Synelec Telecom Multimedia

PS: Please excuse me if explanation are not simple but I'm new with CVS 
... and I'm french too ;-)

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



logs meaning : please help traduce the letters.

2002-01-04 Thread dhuriet

Hi,

I m new using Win CVS on NT ant I don t find in the Documentation any
explanation about the meaning of each letter we see in the log file
when updating a directory content.

for example :


U x/x/x/x/x.jar
cvs.SUN server: nonmergeable file needs merge
cvs.SUN server: revision ...
C x/x/x/x/xx.jar
cvs.SUN server: Updating ...
U x/x/x/x/x/x/x/x/x.java

P x/x/x/x/x/x/x/x/x.java
cvs.SUN server: Updating ...

What does the following letters mean ?

U
P
C
M  ??

Is there a web site for this kind of question ???

Thanks.

   Dam
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: logs meaning : please help traduce the letters.

2002-01-04 Thread Duncan Sommerville


What does the following letters mean ?

U
P
C
M  ??

Hi,

  U - Local file updated
  P - Local file updated (patch sent for performance)
  C - Conflict detected when merging changes with local file
  M - Local file is modified (possibly successfully merged)

The following link explains most of these in more detail:

  http://www.cvshome.org/docs/manual/cvs_16.html#SEC152

Kind Regards,
Duncan.


_
Do You Yahoo!?
Get your free @yahoo.com address at http://mail.yahoo.com


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: cvs error, please help

2001-12-04 Thread Gianni Mariani


You need to figure out what is causing the cvs pserver to die.

Check the system log. /var/log/messages on the server.

You could try setting :

`$CVS_CLIENT_LOG'
Used for debugging only in client-server mode. If set, everything
sent to the server is logged into ``$CVS_CLIENT_LOG'.in' and
everything sent from the server is logged into
``$CVS_CLIENT_LOG'.out'.

`$CVS_SERVER_SLEEP'
Used only for debugging the server side in client-server mode. If
set, delays the start of the server child process the specified
amount of seconds so that you can attach to it with a debugger.

You could also try adding '-t' to your pserver setup.

Is the :pserver: system is out of disk space ?

A brute force diagnostic method I use is 'strace' . Running it in pserver
mode means you need to run a program that forks off an strace and
then execs cvs pserver - it means coding up a little program like that.
The program below does exactly that. I used it once to diagnose a
cvs pserver problem from wincvs (it turned out that the user had
entered the wrong password)!

#include stdlib.h
#include stdio.h
#include fcntl.h
#include errno.h
#include unistd.h
#include sys/types.h
#include string.h

int main( int argc, char ** argv )
{

int errfd = open( /tmp/fixer.log, O_RDWR | O_CREAT, 0777 );
int pid;
int ppid = getpid();

char buf[ 1024 ];

sprintf(
buf,
UID = %d : EUID = %d: GID = %d : EGID = %d\n,
getuid(),
geteuid(),
getgid(),
getegid()
);

write( errfd, buf, strlen( buf ) );

pid = fork();

if ( pid == -1 ) {
int serrno = errno;

dup2( errfd, 2);
errno = serrno;
perror( fork );
exit( 1 );
}


if ( pid ) {

int serrno = errno;
sleep( 3 );
execv( argv[1], argv + 2 );
dup2( errfd, 2);
errno = serrno;
perror( execv );
exit( 1 );
} else {

// Child
char strpid[ 10 ];
char * argx[ 4 ];
dup2( errfd, 1);
dup2( errfd, 2);

argx[ 0 ] = argv[1];
argx[ 1 ] = -p;
argx[ 2 ] = strpid;
argx[ 3 ] = 0;

sprintf( strpid, %d, ppid );
execvp( /usr/bin/strace, argx );
}

}

I doubt that you'll get to the last option, it's for people with
that macho who needs that damn manual attitude - Larry
is probably going to puke ! :)

Good luck
G

[EMAIL PROTECTED] wrote:

hi, 

this mario from steinberg, germany
we are using cvs in our company and
recently got this strange error when we do comits:

cvs [server aborted]: received broken pipe signal
*CVS exited normally with code 1*

the commit process is aborted after finishing one
directory so we can not commit all files of our projects
in one run anymore (and this is annoying ;-)

do you know any solution for this? - I read the manual
and several web pages, without finding an answer

thanx in advance
mario




--  
Tipp: Neuer Gewinnspiel-Service sorgt fuer Furore! 
Wer hier nicht gewinnt, dem ist nicht mehr zu helfen...  

http://webkatalog.freenet.de/perl/show.pl?uri=http://shortwin.de/index.cfm?pp_ID=18648ÿÿÿÈ?úÿrûj)bz(
  b²Ò'~?ܾÏàz(ïè®m¶Yÿþf¢--ø'»ú+fùs(S(Ys(Yùb²Ø§~?â?úÿ





___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: cvs error, please help

2001-12-04 Thread Larry Jones

[EMAIL PROTECTED] writes:
 
 we are using cvs in our company and
 recently got this strange error when we do comits:
 
 cvs [server aborted]: received broken pipe signal

My guess is that you've got a CVSROOT/loginfo file that specifies a
filter program that is exiting without reading its standard input.

-Larry Jones

It's hard to be religious when certain people are never
incinerated by bolts of lightning. -- Calvin

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Please Help

2001-10-03 Thread Olaf Meding


Strangely, the second checkout (see below) will fail with cvs.exe that ships
with WinCVS 1.2 and WinCVS 1.3b4.  However, it works on Linux with cvs
1.10.5 and cvs 1.11.  Is this a bug?  Why does it work on Linux and fail on
Windows?

Given this repository structure:

  test/file1.txt
  test/dir1/file2.txt

  tag both files with test_tag

  cvs co test test/dir1 // this works
  cvs co -rtest_tag test test/dir1  // this fails -- WHY?

The error is:

  cvs checkout: move away test/dir1/file2.txt; it is in the way


Thank you very much in advance for your reply.

Olaf



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



RE: Please Help

2001-10-03 Thread Olaf Meding

Gianni,

You did not answer my question.  It works on Linux, but not an Windows.  My
question is why?  And the checkout is done in a directory that does NOT
already have a test directory.


Olaf


-Original Message-
From: Gianni Mariani [mailto:[EMAIL PROTECTED]]
Sent: Wednesday, October 03, 2001 9:31 AM
To: Olaf Meding
Subject: RE: Please Help




 cvs checkout: move away test/dir1/file2.txt; it is in the way

This means the file test/dir1/file2.txt already exists.  Is that the case ?
If so, try the command in a directory where it does not exist.

G

-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]On Behalf Of
Olaf Meding
Sent: Wednesday, October 03, 2001 6:33 AM
To: info-cvs mailing list
Subject: Please Help



Strangely, the second checkout (see below) will fail with cvs.exe that ships
with WinCVS 1.2 and WinCVS 1.3b4.  However, it works on Linux with cvs
1.10.5 and cvs 1.11.  Is this a bug?  Why does it work on Linux and fail on
Windows?

Given this repository structure:

  test/file1.txt
  test/dir1/file2.txt

  tag both files with test_tag

  cvs co test test/dir1 // this works
  cvs co -rtest_tag test test/dir1  // this fails -- WHY?

The error is:

  cvs checkout: move away test/dir1/file2.txt; it is in the way


Thank you very much in advance for your reply.

Olaf



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Please help!

2001-09-20 Thread Alex Flores




Our cvs server was 
recently infected by the Nimda virus. All of the directories now have a 
#cvs.lock folder that seems to be preventing any files from being checked 
out.


Here is the message 
that is given:


D:\cvsdevcvs co practicecvs server: Updating practicecvs 
server: [09:53:17] waiting for Unknown User's lock in d:/cvs/practicecvs 
server: [09:53:32] waiting for Unknown User's lock in 
d:/cvs/practiceD:\cvsdev


Does anybody have 
some advice on how to fix this. Our last resort will be to re-build from 
backup.


Thanks in 
advance,

Alex




Re: Please help!

2001-09-20 Thread Larry Jones

Alex Flores writes:
 
 Our cvs server was recently infected by the Nimda virus.  All of the
 directories now have a #cvs.lock folder that seems to be preventing any
 files from being checked out.

Make sure that there are no CVS processes running on the server, then
remove those directories (and any lock files: #cvs.rfl* or #cvs.wfl*).

-Larry Jones

See if we can sell Mom and Dad into slavery for a star cruiser. -- Calvin

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



RE: Please help (cvs lock)

2001-09-20 Thread Schwenk, Jeanie

find . -name \#cvs.[rw]fl* -print -exec rm -rf {}\'

The above will do the trick but it's brute force.  But hey, it works.  You
could first exec ll rather than exec rm -rf to see what will be deleted.
Run it from the top of the repository and ALL locks in the repository will
go away (this might not be what you want).

It will remove locks that look like:
#cvs.wfl.pilot.12345   
#cvs.rfl
#cvs.wfl

You may also have lock directories that look like this: #cvs.lock/

You'll need to modify the above find if you have these lock directories.   

Jeanie

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



RE: Could you please help about rsh connection with xinetd

2001-09-16 Thread N-Song/Qiang-Hua ( INC)
Title: RE: Could you please help about rsh connection with xinetd






Thanks for your help! but cvs still can't work.
1. rsh and telnet can login each other, does it mean xinetd works all right?


2. After I run rsh, I can see the log, but no log after I run cvs. still connection refused.


3. After I changed the configure of xinetd, I had restart my computer.


4. In inted, we need add client's IP address to .rhosts, how can I do this step in
 xinetd, is it the same? I have done it, but also failed.


5. I can't run rsh 10.170.8.190 cvs -v, prompt: connection refused., though I can login 
 to cvs server with rsh.



-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
Sent: Sunday, September 16, 2001 1:02 AM
To: [EMAIL PROTECTED]
Cc: [EMAIL PROTECTED]; [EMAIL PROTECTED]
Subject: Re: Could you please help about rsh connection with xinetd



=?big5?B?Ti1Tb25nL1FpYW5nLUh1YSAgKKe6sWq12CAgSU5DKQ==?= writes:
 
 # cvs import testcvs ORIGINAL START
 prompt: connection refused.
 
 I don't know whether it is the setting of network or cvs.


That error indicates that xinetd isn't listening for connections on the
cvspserver port. Make sure you had xinetd re-read it's configuration
info after you changed it and check your syslog for error messages from
xinetd.


-Larry Jones


Shut up and go get me some antiseptic. -- Calvin





Re: Could you please help about rsh connection with xinetd

2001-09-15 Thread Larry Jones

=?big5?B?Ti1Tb25nL1FpYW5nLUh1YSAgKKe6sWq12CAgSU5DKQ==?= writes:
 
 # cvs import testcvs ORIGINAL START
 prompt: connection refused.
 
 I don't know whether it is the setting of network or cvs.

That error indicates that xinetd isn't listening for connections on the
cvspserver port.  Make sure you had xinetd re-read it's configuration
info after you changed it and check your syslog for error messages from
xinetd.

-Larry Jones

Shut up and go get me some antiseptic. -- Calvin

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: Could you please help about rsh connection with xinetd

2001-09-14 Thread Larry Jones

Qiang-Hua Song writes:
 
   server_args = -f -allow -root=/usr/cvsroot pserver

That should be --allow-root, not -allow -root.

-Larry Jones

Whatever it is, it's driving me crazy! -- Calvin

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: Could you please help about rsh connection with xinetd

2001-09-14 Thread Derek Robert Price

N-Song/Qiang-Hua (§º±jµØ INC) wrote:



 Thanks for your help, but this server_args was also failed.
server_args = -f --allow-root=/usr/cvsroot pserver

 # cvs import testcvs ORIGINAL START
 prompt: connection refused.

 I don't know whether it is the setting of network or cvs.

This usually means that there's a firewall in the way or xinetd isn't
configured properly.  Try telnetting from localhost and then from the
client machine.

This section of the CVS manual has more information:

http://www.cvshome.org/docs/manual/cvs_21.html#SEC182

Derek



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



RE: Could you please help about rsh connection with xinetd

2001-09-14 Thread N-Song/Qiang-Hua ( INC)
Title: RE: Could you please help about rsh connection with xinetd






Thanks for your help, but this server_args was also failed.
  server_args = -f --allow-root=/usr/cvsroot pserver


# cvs import testcvs ORIGINAL START
prompt: connection refused.


I don't know whether it is the setting of network or cvs.


In client computer's profile, I add:
export CVSROOT=:ext:[EMAIL PROTECTED]:/home/qhs/cvsroot
#export CVSROOT=:ext:[EMAIL PROTECTED]:/home/qhs/cvsroot
export CVS_RSH=rsh
export EDITOR=vi


In server computer's profile, I add:
export CVSROOT=/home/qhs/cvsroot
export CVS_RSH=rsh
export EDITOR=vi
And add user qhsat linuxconf.
Key in cvs init command:
# cvs init
no prompt.


and I also set netconf at server and client:
server: netconf - Misc - Information about other hosts - Add - qhs.inc.inventec qhs 10.170.8.66
client: netconf - Misc - Information about other hosts - Add - fia-1.inc.inventec fia-1 10.170.8.190


Best Regards
Qianghua Song



-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
Sent: Saturday, September 15, 2001 3:29 AM
To: [EMAIL PROTECTED]
Cc: [EMAIL PROTECTED]; [EMAIL PROTECTED]; [EMAIL PROTECTED]
Subject: Re: Could you please help about rsh connection with xinetd



Qiang-Hua Song writes:
 
  server_args = -f -allow -root=/usr/cvsroot pserver


That should be --allow-root, not -allow -root.


-Larry Jones


Whatever it is, it's driving me crazy! -- Calvin





Could you please help about rsh connection with xinetd

2001-09-13 Thread Qiang-Hua Song
Title: Could you please help about rsh connection with xinetd






Dear sirs,


I can setup cvs server with rsh connection by inetd.conf.


But now we use xinetd for rsh connection in redhat 7.0, 


do you know how to set xinetd.conf and in /etc/xinetd.d/rsh.


This is my setting for /etc/xinetd.d/rsh.

service shell
{
 disable  = no
 socket_type = stream
 wait  = no
 user  = root
 log_on_success += USERID
 log_on_failure += USERID
 port  = 2401
 protocol = tcp
 server  = /usr/bin/cvs
 server_args = -f -allow -root=/usr/cvsroot pserver
}



and also I added my client cvs's IP address in /etc/hosts.allow


Does it correct? please help!


Best Regards
Qianghua Song





Re: Could you please help about rsh connection with xinetd

2001-09-13 Thread Derek Robert Price

Qiang-Hua Song wrote:



 Dear sirs,

 I can setup cvs server with rsh connection by inetd.conf.

 But now we use xinetd for rsh connection in redhat 7.0,

 do you know how to set xinetd.conf and in /etc/xinetd.d/rsh.

 This is my setting for /etc/xinetd.d/rsh.
 
 service shell
 {
 disable = no
 socket_type = stream
 wait= no
 user= root
 log_on_success += USERID
 log_on_failure  += USERID
 port= 2401
 protocol= tcp
 server  = /usr/bin/cvs
 server_args = -f -allow -root=/usr/cvsroot pserver
 }
 

 and also I added my client cvs's IP address in /etc/hosts.allow

 Does it correct? please help!

Please send inquiries of this sort to the [EMAIL PROTECTED] mailing list.

Derek




___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



please help in integrating 2 repositories..

2001-06-25 Thread Akash Agrawal

I am trying to synchronize to CVS repositories .One repository is in US
and the other one in India .How can I do that???I read about CVSup but
for that I need to install CVSup server on both the machine one in US
and one in India? Is there any other way doing this?

Thanks,
Akash


begin:vcard 
n:Agrawal;Akash
tel;work:2251554 ext 1349
x-mozilla-html:FALSE
adr:;;
version:2.1
email;internet:[EMAIL PROTECTED]
fn:Akash Agrawal
end:vcard



Re: please help in integrating 2 repositories..

2001-06-25 Thread Karl-Heinz Marbaise

Akash Agrawal wrote:
 
 I am trying to synchronize to CVS repositories .One repository is in US
 and the other one in India .How can I do that???I read about CVSup but
 for that I need to install CVSup server on both the machine one in US
 and one in India? Is there any other way doing this?
 
 Thanks,
 Akash

Have you ever thought about cvs co Project on US-Site and
checking this in on India site?
You can reduce overhead due to use just diff's.

What you need:
  1. Two persons reponsible
   One in US
   One in India
  2. checking out project on both sides.
   Build a diff on US site if anyone 
   commits things into repository.
   Send this diff via e-mail to
   India and patch the check'ed out
   version on India site and
   commit it there.

This would one solving.

Or you can automatize the US site thing using
triggers of CVS to send e-mail and building diffs


Kind Regards.

-- 
Dipl.-Ing. Karl Heinz Marbaise | Phone: +49 (241) 4 13 26 - 48
QIS Systemhaus GmbH Aachen | Fax  : +49 (241) 4 13 26 - 40
Juelicher Strasse 338  | Internet: http://www.qis-systemhaus.de
52070 Aachen   | e-mail  : [EMAIL PROTECTED]

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: please help

2001-06-21 Thread Matthew Riechers

Thyag wrote:
 
 Hello,
 I am trying to setup an account on our CVS server for a new employee at
 Voicepump Inc. here in Schaumburg, IL.
 
 I need a detailed instruction on how I can do it.
 
 the server runs Lynux and the client runs WINCVS on windows machine.
 
 Could you please help me, since I have deadlines to get this done...
 
 Thanks,
 Thyag.

On the linux box, check to see if you have a $CVSROOT/CVSROOT/passwd
file. If so, take a look at
http://cvshome.org/docs/manual/cvs_2.html#SEC29

If not, add one, since cvs will use /etc/passwd and will transmit the
user's *system* password in cleartext.

-Matt

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



please help

2001-06-20 Thread Thyag

Hello,
I am trying to setup an account on our CVS server for a new employee at
Voicepump Inc. here in Schaumburg, IL.

I need a detailed instruction on how I can do it.

the server runs Lynux and the client runs WINCVS on windows machine.

Could you please help me, since I have deadlines to get this done...

Thanks,
Thyag.


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Silly Unknown Host problem- please help!

2001-05-03 Thread Susan Margulies

Hello, all! I'm over in Taiwan connecting via DSL to a server in California. 
I mention that only because I was happily connecting via a cable modem and 
checking my code into CVS, and when I changed technologies, it appears to 
have broken. Of course, that happens to coincide with our sys admin moving 
the server to a new office, but he is convinced that nothing has changed. 
So...

cvs login
(Logging in to [EMAIL PROTECTED])
Unknown host 206.14.215.111.

I can connect using WinFTP and SecureCRT to this machine, using the
same user name and password. Also, when I try the debugging suggestion:

telnet 206.14.215.111 2401

and send random text, I do see:

cvs [pserver aborted]: bad auth protocol start: foo

Any suggestions at all would be lovely! I would really appreciate any
help! I have combed the documentation, but can't find any reference to
unknown host errors.

Thanks in advance!
Susan
_
Get your FREE download of MSN Explorer at http://explorer.msn.com


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Please help! A problem running cvsweb

2001-02-22 Thread Yuhe Liu



-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]On Behalf Of
Yuhe Liu
Sent: Wednesday, February 21, 2001 11:12 AM
To: info-cvs
Subject: A problem running cvsweb


Hi,

I just setup my web server to run cvsweb. The cgi scripts did display the
cvs trees in the
browser. However, when I clicked into a directory, for example CVSROOT, it
showed me
no file but an Emptydir with a note in the following:

NOTE: There are 15 files, but none matches the current tag () 

Here is the setup I did for cvsweb.

1. The actual repository was on a remote site. The directory where the top
module
residents was shared as read-only NFS to the cvsweb server. The version of
CVS
was 1.11.

2. On cvsweb server, a cvs repository was created based on the shared
read-only NFS.
I tried to make it as close to the original repository as possible. The
CVSROOT subdirectory
was copied from the original. The version of CVS was 1.10.x. I couldn't find
the same
version for the x86 solaris 8.

Any idea what's happened?


Yuhe Liu

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: please help, cvs problem

2001-01-25 Thread Marinalva Dias Soares


Please, try to give the permissions 755 to the directory root. 

On Wed, 24 Jan 2001, Patrick Amirian wrote:

 Hi and thanks for reading,
 
 I'm trying to set up a cvs repository,
 this is how I'm doing it,
 
 create the directory /home/patrick/cvsroot
 then I do
 cvs -d /home/patrick/cvsroot init
 
 then I create my xinetd.conf file oh by the way I'm on RH 7.0
 
 service cvspserver
 {
socket_type = stream
protocol= tcp
wait= no
user= root
passenv =
server  = /usr/bin/cvs
server_args = --allow-root=/home/pamirian/cvsroot pserver
 }
 
 and then I create a passwd file in /home/patrick/cvsroot/CVSROOT directory
 
 when I do
 
 cvs -d :pserver:patrick@matrix:/home/patrick/cvsroot login
 it asks for the pass, I type the pass and it works great
 
 BUT,
 when I do
 cvs -d :pserver:patrick@matrix:/home/patrick/cvsroot import -m "first 
 test" test patrick start
 it also works but at first it gives me this message,
 
 cvs server: cannot open /root/.cvsignore: Permission denied.
 
 then when I do a
 cvs -d :pserver:patrick@matrix:/home/patrick/cvsroot checkout test
 
 it gives me,
 cvs server: cannot open /root/.cvsignore : Permission denied
 cvs [server aborted]: can't chdir (/root): Permission denied
 
 how can I fix this ?
 
 please don't point me at howtos, I already have 2 cvs books and few cvs 
 related documents but they don't cover this errors...
 
 thank you very much for you time, I really appreciate it.
 -Patrick
 
 
 ___
 Info-cvs mailing list
 [EMAIL PROTECTED]
 http://mail.gnu.org/mailman/listinfo/info-cvs
 


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: please help, cvs problem

2001-01-25 Thread Larry Jones

Patrick Amirian writes:
 
server_args = --allow-root=/home/pamirian/cvsroot pserver

 cvs server: cannot open /root/.cvsignore : Permission denied
 cvs [server aborted]: can't chdir (/root): Permission denied

You need to add -f to the server_args, just like it says in the manual
(http://www.cvshome.org/docs/manual/cvs_21.html#SEC182 near the end of
the section).  If that doesn't fix the problem, see the manual and the
archives of this list (http://mail.gnu.org/pipermail/info-cvs/) for more
help; this is a *very* frequently asked question.

-Larry Jones

In short, open revolt and exile is the only hope for change? -- Calvin

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



RE: please help, cvs problem

2001-01-25 Thread Jerry Nairn

In the archives of the info-cvs list is an email from [EMAIL PROTECTED]
describing how to set this up, and there's a reply from
[EMAIL PROTECTED] with an additional suggestion.

Use something like this:
service cvspserver
{
socket_type = stream
wait= no
user= root
env = HOME=/home/pamirian/cvsroot
server  = /usr/bin/cvs
server_args = -f --allow-root=/home/pamirian/cvsroot pserver
}

 From: Patrick Amirian [mailto:[EMAIL PROTECTED]]
 Sent: Wednesday, January 24, 2001 9:39 PM

 my fault, consider pamirian being patrick
 there is no problem with my directories... I'm not sure but 
 it seems to 
 be some kind of a permission problem when it's trying to access the 
 /root/.cvsignore file ... why root tho ? is it because cvs is 
 running as 
 root ?

Partly, but mainly because if HOME is set, cvs tries to read ${HOME}/.cvsrc
immediately when it starts, unless you run "cvs -f "

Cheers,
Jerry

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



please help, cvs problem

2001-01-24 Thread Patrick Amirian

Hi and thanks for reading,

I'm trying to set up a cvs repository,
this is how I'm doing it,

create the directory /home/patrick/cvsroot
then I do
cvs -d /home/patrick/cvsroot init

then I create my xinetd.conf file oh by the way I'm on RH 7.0

service cvspserver
{
   socket_type = stream
   protocol= tcp
   wait= no
   user= root
   passenv =
   server  = /usr/bin/cvs
   server_args = --allow-root=/home/pamirian/cvsroot pserver
}

and then I create a passwd file in /home/patrick/cvsroot/CVSROOT directory

when I do

cvs -d :pserver:patrick@matrix:/home/patrick/cvsroot login
it asks for the pass, I type the pass and it works great

BUT,
when I do
cvs -d :pserver:patrick@matrix:/home/patrick/cvsroot import -m "first 
test" test patrick start
it also works but at first it gives me this message,

cvs server: cannot open /root/.cvsignore: Permission denied.

then when I do a
cvs -d :pserver:patrick@matrix:/home/patrick/cvsroot checkout test

it gives me,
cvs server: cannot open /root/.cvsignore : Permission denied
cvs [server aborted]: can't chdir (/root): Permission denied

how can I fix this ?

please don't point me at howtos, I already have 2 cvs books and few cvs 
related documents but they don't cover this errors...

thank you very much for you time, I really appreciate it.
-Patrick


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: please help, cvs problem

2001-01-24 Thread Michael Peck

You have the allow-root set to /home/pamarian, but did a cvs init on
/home/patrick.  That's the problem.

Patrick Amirian wrote:

 Hi and thanks for reading,

 I'm trying to set up a cvs repository,
 this is how I'm doing it,

 create the directory /home/patrick/cvsroot
 then I do
 cvs -d /home/patrick/cvsroot init

 then I create my xinetd.conf file oh by the way I'm on RH 7.0

 service cvspserver
 {
socket_type = stream
protocol= tcp
wait= no
user= root
passenv =
server  = /usr/bin/cvs
server_args = --allow-root=/home/pamirian/cvsroot pserver
 }

 and then I create a passwd file in /home/patrick/cvsroot/CVSROOT directory

 when I do

 cvs -d :pserver:patrick@matrix:/home/patrick/cvsroot login
 it asks for the pass, I type the pass and it works great

 BUT,
 when I do
 cvs -d :pserver:patrick@matrix:/home/patrick/cvsroot import -m "first
 test" test patrick start
 it also works but at first it gives me this message,

 cvs server: cannot open /root/.cvsignore: Permission denied.

 then when I do a
 cvs -d :pserver:patrick@matrix:/home/patrick/cvsroot checkout test

 it gives me,
 cvs server: cannot open /root/.cvsignore : Permission denied
 cvs [server aborted]: can't chdir (/root): Permission denied

 how can I fix this ?

 please don't point me at howtos, I already have 2 cvs books and few cvs
 related documents but they don't cover this errors...

 thank you very much for you time, I really appreciate it.
 -Patrick

 ___
 Info-cvs mailing list
 [EMAIL PROTECTED]
 http://mail.gnu.org/mailman/listinfo/info-cvs



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: please help, cvs problem

2001-01-24 Thread Patrick Amirian

my fault, consider pamirian being patrick
there is no problem with my directories... I'm not sure but it seems to 
be some kind of a permission problem when it's trying to access the 
/root/.cvsignore file ... why root tho ? is it because cvs is running as 
root ?

Michael Peck wrote:

 You have the allow-root set to /home/pamarian, but did a cvs init on
 /home/patrick.  That's the problem.
 
 Patrick Amirian wrote:
 
 Hi and thanks for reading,
 
 I'm trying to set up a cvs repository,
 this is how I'm doing it,
 
 create the directory /home/patrick/cvsroot
 then I do
 cvs -d /home/patrick/cvsroot init
 
 then I create my xinetd.conf file oh by the way I'm on RH 7.0
 
 service cvspserver
 {
socket_type = stream
protocol= tcp
wait= no
user= root
passenv =
server  = /usr/bin/cvs
server_args = --allow-root=/home/pamirian/cvsroot pserver
 }
 
 and then I create a passwd file in /home/patrick/cvsroot/CVSROOT directory
 
 when I do
 
 cvs -d :pserver:patrick@matrix:/home/patrick/cvsroot login
 it asks for the pass, I type the pass and it works great
 
 BUT,
 when I do
 cvs -d :pserver:patrick@matrix:/home/patrick/cvsroot import -m "first
 test" test patrick start
 it also works but at first it gives me this message,
 
 cvs server: cannot open /root/.cvsignore: Permission denied.
 
 then when I do a
 cvs -d :pserver:patrick@matrix:/home/patrick/cvsroot checkout test
 
 it gives me,
 cvs server: cannot open /root/.cvsignore : Permission denied
 cvs [server aborted]: can't chdir (/root): Permission denied
 
 how can I fix this ?
 
 please don't point me at howtos, I already have 2 cvs books and few cvs
 related documents but they don't cover this errors...
 
 thank you very much for you time, I really appreciate it.
 -Patrick
 
 ___
 Info-cvs mailing list
 [EMAIL PROTECTED]
 http://mail.gnu.org/mailman/listinfo/info-cvs
 
 
 
 
 ___
 Info-cvs mailing list
 [EMAIL PROTECTED]
 http://mail.gnu.org/mailman/listinfo/info-cvs
 
 


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



Re: please help if you can..

2000-07-10 Thread Johan De Wit


 C:\cvshome\orekcvs commit
 CVS.EXE commit: Examining .
 I don't know what kind of terminal you are on - all I
 have is 'unknown'.

Don't know for sure, but is there an environment var EDITOR set on your system 
??  Seems cvs cannot open the editor for typing the history comment.

If cvs commit -m"type here the history comment"  works, then no EDITOR is 
found.


Greetings 
jo
 
 _the end_
 I have a feeling its something stupid, but I don't know
 enough on either unix nor msdos not cvs to figure it
 out quickly by myself. 
 
 thank you :) 
 Liat. 
 
 
 
 _
 Protect your Computer from Viruses Sent via E-mail at 
http://www.mailcleaner.com
 

Greetings

Jo.



=
|   |
|  Say it back, I hate Windows, so I hack ! |
|   |
=





Re: please help if you can [Win95]

2000-07-10 Thread Avi Green

Liat Atsmon wrote:

 C:\cvshome\orekcvs commit
 CVS.EXE commit: Examining .
 I don't know what kind of terminal you are on - all I
 have is 'unknown'.

Liat,

Until you get a better answer from a CVS guru, here's my guess as a Unix
guy:

The problem is that CVS was designed originally for Unix systems and use
a Unix model, which you'll have to emulate.  You'll probably need to set
the terminal type.  I don't know what the terminal type of an msdos
system is, but I'd try "ansi."  Type "set TERM=ansi" once at the
Windows/DOS prompt if you'll be running any cvs commands which require
full-screen editing (e.g. commit).

 
 [Using open mode]
 "/tmp/cvsAAAaaenia" 25 lines, 687 characters
 cvs server: warning: editor session failed
 TITLE:
 Log message unchanged or not specified
 abort, continue, edit, !reuse this message unchanged
 for remaining dirs
 
 cvs server: cannot read from stdin: No such file or directory
 
 cvs [server aborted]: aborting
 Action:  continue 
 CVS.EXE commit: saving log message in C:\windows\temp\10

More Unixlike junk.  This I can't really help with.

Hatzlacha,
Avi

-- 

=  Avi Green :) (: www.sputnik7.com  =
 Unix S/A  System Specialist 
  avi at sputnik7.com   212 217-1147  




Re: Please help: WinCVS: Tcl script looking for locked files

2000-06-22 Thread Win32 M$

I mixed that with the Fast Search Modified, so now it can recurse down the
directory tree...


- Original Message -
From: "Hans Schmid" [EMAIL PROTECTED]
To: "Lars-Christian Schulze" [EMAIL PROTECTED]
Cc: "Info-Cvs" [EMAIL PROTECTED]
Sent: Wednesday, June 21, 2000 7:54 PM
Subject: RE: Please help: WinCVS: Tcl script looking for locked files


 Thanks very much, Lars-Christian !!

 I managed to get your script to work with WinCVS.

 There seems to be a bug in the internal WinCVS command used in the
original
 script.

 So here for all of you the WinCVS version (which i enhanced for
 multiselected files):


 #!CVSGUI1.0 --selection  --name "Locked Files"

 proc report_locks {name} {
   global cvs
   global cvscfg
   global cwd
   upvar  linenum linenum

   set linenum 1

   set commandline "cvs -l log $name"
   catch {eval "exec $commandline"} view_this

   set filelist ""
   set found "f"
   set view_lines [split $view_this "\n"]

   foreach line $view_lines {
 if {[string match "Working file: *" $line]} {
   regsub "Working file: " $line "" filename
   lappend filelist $filename
   set locklist($filename) ""
 }
 if {[string match "*locked by*" $line]} {
   lappend locklist($filename) $line
   set found "t"
 }
   }

   incr linenum 2

   if { $found == "t" } {
 foreach filename $filelist {
   if { [llength $locklist($filename)]  0 } {
 cvsout [format "\n %s:\n" $filename]
 incr linenum
 foreach rev $locklist($filename) {
   cvsout [format "%s\n" $rev]
   incr linenum
 }
   }
 }
   } else {
 incr linenum 2
   }


 }

 set selList [cvsbrowser get]
 set selSize [llength $selList]

 cvsout "\nLocked files:\n"
 cvsout   "\n"
 for {set i 0} {$i  $selSize} {incr i} {
 set file [lindex $selList $i]
 report_locks $file
 }
 cvsout "\n\n"
 cvsout "Checking for locks finished\n\n"





 Cheers, Hans




 -Original Message-
 From: Lars-Christian Schulze [mailto:[EMAIL PROTECTED]]
 Sent: Wednesday, June 21, 2000 1:03 PM
 To: Hans Schmid
 Cc: Info-Cvs
 Subject: Re: Please help: WinCVS: Tcl script looking for locked files


 On Wed, 21 Jun 2000, Hans Schmid wrote:

  Hi all,
 
  I am looking for a Tcl script to check, if files are locked by somebody
  (using strict locking)
  I modified the SelectionTest.tcl script coming with WinCVS 1.1b14 to
show
  the $fileInfo(locked) files
 
  Unfortunately the following statement seems always to return 1 (file
 locked)
  even on unlocked files
 
  cvsout "-- Locked :   " $fileInfo(locked) "\n"   -- always 1, even
  for not locked files
 
  Is this a known bug or do I miss something obvious.
 
  Here the script I am using:
 
  [ script deleted ...]

 Dear Hans,

 I don't use WinCVS and therefore I do not understand all details of
 your script I do not know the interface between WinCVS and the Tcl
 scripts.  I assume that the informations about files an directories are
 provided by WinCVS via 'browsit'.  Therefore I could only guess that the
 misbehaviour might be a WinCVS bug.

 But I wrote a similar script for TkCVS a few weeks ago, which I appended
 below.  It calls the 'cvs log' command directly and catches the output in
 'view_this'.

 Then the output is scanned in two steps. First all filenames are stored in
 'filelist'. The corresponding locked revisions are stored in the array
 'locklist(...)'.

 In the second step the result is formated for output.  In TkCVS the result
 is displayed using a special "viewer" which opens its own window for
 displaying text.  I think this could be replaced by 'cvsout' command to
 make the result appear in the WinCVS console window.  The script will
 also show if several revisions of a file are locked and by whom.

 Maybe this helps you.

 Lars

 ---
 aerodata Flugmesstechnik GmbH  Email   [EMAIL PROTECTED]
 Lars-Christian Schulze WWW www.aerodata.de
 Hermann-Blenk-Str. 36  Voice   +49 531 2359-188
 D-38108 Braunschweig   Fax +49 531 2359-158


 -- Extract from cvs.tcl, part of TkCVS, version 6.3 --

 proc report_locks {} {
   global cvs
   global cvscfg
   global cwd
   upvar  linenum linenum

   gen_log:log T "ENTER"

   if {! [winfo exists .viewer]} {
 viewer_setup
   } else {
 .viewer.text configure -state normal
 .viewer.text delete 1.0 end
   }
   set linenum 1

   set commandline "$cvs -d $cvscfg(cvsroot) -l log"
   gen_log:log C "$commandline"
   catch {eval "exec $commandline"} view_this

   set filelist ""
   set 

Please help: WinCVS: Tcl script looking for locked files

2000-06-21 Thread Hans Schmid

Hi all,

I am looking for a Tcl script to check, if files are locked by somebody
(using strict locking)
I modified the SelectionTest.tcl script coming with WinCVS 1.1b14 to show
the $fileInfo(locked) files

Unfortunately the following statement seems always to return 1 (file locked)
even on unlocked files

cvsout "-- Locked :   " $fileInfo(locked) "\n"   -- always 1, even
for not locked files

Is this a known bug or do I miss something obvious.

Here the script I am using:

#!CVSGUI1.0 --selection  --name "Lock sample"

global numFound
set numFound 0

proc iterate {dirName} {
cvsentries $dirName browsit

set selList [browsit get]
set selSize [llength $selList]
set toRecurse {}
set printFlag 1

for {set j 0} {$j  $selSize} {incr j} {
set file [lindex $selList $j]
browsit info $file fileInfo2

if {[string compare $fileInfo2(kind) "file"] == 0} {
if {$fileInfo2(locked) == 1} {
if {$printFlag == 1} {
cvsout "In $dirName :\n"
set printFlag 0
}
cvserr "$fileInfo2(name) is locked\n"
global numFound
incr numFound
}
}

if {[string compare $fileInfo2(kind) "folder"] == 0  
$fileInfo2(missing)
== 0  $fileInfo2(unknown) == 0} {
lappend toRecurse $file
}
}

set selRecurse [llength $toRecurse]
for {set j 0} {$j  $selRecurse} {incr j} {
set file [lindex $toRecurse $j]
iterate $file
}
}

set selList [cvsbrowser get]
set selSize [llength $selList]

cvsout "Looking for locked files...\n"
for {set i 0} {$i  $selSize} {incr i} {
set file [lindex $selList $i]
cvsbrowser info $file fileInfo

if {[string compare $fileInfo(kind) "folder"] == 0  $fileInfo(missing) ==
0  $fileInfo(unknown) == 0} {
iterate $file
}
}


cvsout "Done !\n"
cvsout "$numFound file(s) locked !\n"


Thanks and best Regards,
Hans




RE: Please help: WinCVS: Tcl script looking for locked files

2000-06-21 Thread Hans Schmid

Thanks very much, Lars-Christian !!

I managed to get your script to work with WinCVS.

There seems to be a bug in the internal WinCVS command used in the original
script.

So here for all of you the WinCVS version (which i enhanced for
multiselected files):


#!CVSGUI1.0 --selection  --name "Locked Files"

proc report_locks {name} {
  global cvs
  global cvscfg
  global cwd
  upvar  linenum linenum

  set linenum 1

  set commandline "cvs -l log $name"
  catch {eval "exec $commandline"} view_this

  set filelist ""
  set found "f"
  set view_lines [split $view_this "\n"]

  foreach line $view_lines {
if {[string match "Working file: *" $line]} {
  regsub "Working file: " $line "" filename
  lappend filelist $filename
  set locklist($filename) ""
}
if {[string match "*locked by*" $line]} {
  lappend locklist($filename) $line
  set found "t"
}
  }

  incr linenum 2

  if { $found == "t" } {
foreach filename $filelist {
  if { [llength $locklist($filename)]  0 } {
cvsout [format "\n %s:\n" $filename]
incr linenum
foreach rev $locklist($filename) {
  cvsout [format "%s\n" $rev]
  incr linenum
}
  }
}
  } else {
incr linenum 2
  }


}

set selList [cvsbrowser get]
set selSize [llength $selList]

cvsout "\nLocked files:\n"
cvsout   "\n"
for {set i 0} {$i  $selSize} {incr i} {
set file [lindex $selList $i]
report_locks $file
}
cvsout "\n\n"
cvsout "Checking for locks finished\n\n"





Cheers, Hans




-Original Message-
From: Lars-Christian Schulze [mailto:[EMAIL PROTECTED]]
Sent: Wednesday, June 21, 2000 1:03 PM
To: Hans Schmid
Cc: Info-Cvs
Subject: Re: Please help: WinCVS: Tcl script looking for locked files


On Wed, 21 Jun 2000, Hans Schmid wrote:

 Hi all,

 I am looking for a Tcl script to check, if files are locked by somebody
 (using strict locking)
 I modified the SelectionTest.tcl script coming with WinCVS 1.1b14 to show
 the $fileInfo(locked) files

 Unfortunately the following statement seems always to return 1 (file
locked)
 even on unlocked files

   cvsout "-- Locked :   " $fileInfo(locked) "\n"   -- always 1, even
 for not locked files

 Is this a known bug or do I miss something obvious.

 Here the script I am using:

 [ script deleted ...]

Dear Hans,

I don't use WinCVS and therefore I do not understand all details of
your script I do not know the interface between WinCVS and the Tcl
scripts.  I assume that the informations about files an directories are
provided by WinCVS via 'browsit'.  Therefore I could only guess that the
misbehaviour might be a WinCVS bug.

But I wrote a similar script for TkCVS a few weeks ago, which I appended
below.  It calls the 'cvs log' command directly and catches the output in
'view_this'.

Then the output is scanned in two steps. First all filenames are stored in
'filelist'. The corresponding locked revisions are stored in the array
'locklist(...)'.

In the second step the result is formated for output.  In TkCVS the result
is displayed using a special "viewer" which opens its own window for
displaying text.  I think this could be replaced by 'cvsout' command to
make the result appear in the WinCVS console window.  The script will
also show if several revisions of a file are locked and by whom.

Maybe this helps you.

Lars

---
aerodata Flugmesstechnik GmbH  Email   [EMAIL PROTECTED]
Lars-Christian Schulze WWW www.aerodata.de
Hermann-Blenk-Str. 36  Voice   +49 531 2359-188
D-38108 Braunschweig   Fax +49 531 2359-158


-- Extract from cvs.tcl, part of TkCVS, version 6.3 --

proc report_locks {} {
  global cvs
  global cvscfg
  global cwd
  upvar  linenum linenum

  gen_log:log T "ENTER"

  if {! [winfo exists .viewer]} {
viewer_setup
  } else {
.viewer.text configure -state normal
.viewer.text delete 1.0 end
  }
  set linenum 1

  set commandline "$cvs -d $cvscfg(cvsroot) -l log"
  gen_log:log C "$commandline"
  catch {eval "exec $commandline"} view_this

  set filelist ""
  set found "f"
  set view_lines [split $view_this "\n"]

  foreach line $view_lines {
if {[string match "Working file: *" $line]} {
  regsub "Working file: " $line "" filename
  lappend filelist $filename
  set locklist($filename) ""
}
if {[string match "*locked by*" $line]} {
  lappend locklist($filename) $line
  set found "t"
}
  }

  .viewer.text insert end "\nLocked files:\n

Re: Please help: WinCVS: Tcl script looking for locked files

2000-06-21 Thread Alexandre Parenteau

Hello,

Hans Schmid wrote:
 There seems to be a bug in the internal WinCVS command used in the original
 script.

I think you expect to have the cvs locking informations, while the macro
really provides the "read-only" state of the file, which is now for
something completly different ;-)

Regards,
alex.

 
 So here for all of you the WinCVS version (which i enhanced for
 multiselected files):
 
 #!CVSGUI1.0 --selection  --name "Locked Files"
 
 proc report_locks {name} {
   global cvs
   global cvscfg
   global cwd
   upvar  linenum linenum
 
   set linenum 1
 
   set commandline "cvs -l log $name"
   catch {eval "exec $commandline"} view_this
 
   set filelist ""
   set found "f"
   set view_lines [split $view_this "\n"]
 
   foreach line $view_lines {
 if {[string match "Working file: *" $line]} {
   regsub "Working file: " $line "" filename
   lappend filelist $filename
   set locklist($filename) ""
 }
 if {[string match "*locked by*" $line]} {
   lappend locklist($filename) $line
   set found "t"
 }
   }
 
   incr linenum 2
 
   if { $found == "t" } {
 foreach filename $filelist {
   if { [llength $locklist($filename)]  0 } {
 cvsout [format "\n %s:\n" $filename]
 incr linenum
 foreach rev $locklist($filename) {
   cvsout [format "%s\n" $rev]
   incr linenum
 }
   }
 }
   } else {
 incr linenum 2
   }
 
 }
 
 set selList [cvsbrowser get]
 set selSize [llength $selList]
 
 cvsout "\nLocked files:\n"
 cvsout   "\n"
 for {set i 0} {$i  $selSize} {incr i} {
 set file [lindex $selList $i]
 report_locks $file
 }
 cvsout "\n\n"
 cvsout "Checking for locks finished\n\n"
 
 Cheers, Hans
 
 -Original Message-
 From: Lars-Christian Schulze [mailto:[EMAIL PROTECTED]]
 Sent: Wednesday, June 21, 2000 1:03 PM
 To: Hans Schmid
 Cc: Info-Cvs
 Subject: Re: Please help: WinCVS: Tcl script looking for locked files
 
 On Wed, 21 Jun 2000, Hans Schmid wrote:
 
  Hi all,
 
  I am looking for a Tcl script to check, if files are locked by somebody
  (using strict locking)
  I modified the SelectionTest.tcl script coming with WinCVS 1.1b14 to show
  the $fileInfo(locked) files
 
  Unfortunately the following statement seems always to return 1 (file
 locked)
  even on unlocked files
 
cvsout "-- Locked :   " $fileInfo(locked) "\n"   -- always 1, even
  for not locked files
 
  Is this a known bug or do I miss something obvious.
 
  Here the script I am using:
 
  [ script deleted ...]
 
 Dear Hans,
 
 I don't use WinCVS and therefore I do not understand all details of
 your script I do not know the interface between WinCVS and the Tcl
 scripts.  I assume that the informations about files an directories are
 provided by WinCVS via 'browsit'.  Therefore I could only guess that the
 misbehaviour might be a WinCVS bug.
 
 But I wrote a similar script for TkCVS a few weeks ago, which I appended
 below.  It calls the 'cvs log' command directly and catches the output in
 'view_this'.
 
 Then the output is scanned in two steps. First all filenames are stored in
 'filelist'. The corresponding locked revisions are stored in the array
 'locklist(...)'.
 
 In the second step the result is formated for output.  In TkCVS the result
 is displayed using a special "viewer" which opens its own window for
 displaying text.  I think this could be replaced by 'cvsout' command to
 make the result appear in the WinCVS console window.  The script will
 also show if several revisions of a file are locked and by whom.
 
 Maybe this helps you.
 
 Lars
 
 ---
 aerodata Flugmesstechnik GmbH  Email   [EMAIL PROTECTED]
 Lars-Christian Schulze WWW www.aerodata.de
 Hermann-Blenk-Str. 36  Voice   +49 531 2359-188
 D-38108 Braunschweig   Fax +49 531 2359-158
 
 -- Extract from cvs.tcl, part of TkCVS, version 6.3 --
 
 proc report_locks {} {
   global cvs
   global cvscfg
   global cwd
   upvar  linenum linenum
 
   gen_log:log T "ENTER"
 
   if {! [winfo exists .viewer]} {
 viewer_setup
   } else {
 .viewer.text configure -state normal
 .viewer.text delete 1.0 end
   }
   set linenum 1
 
   set commandline "$cvs -d $cvscfg(cvsroot) -l log"
   gen_log:log C "$commandline"
   catch {eval "exec $commandline"} view_this
 
   set filelist ""
   set found "f"
   set view_lines [split $view_this "\n"]
 
   foreach line $view_lines {
 if {[string match "Working file: *" $line]} {
   regsub "Working file: " $lin

Re: CVS in an integrated environment? please help...

2000-02-21 Thread Paul Sander

--- Forwarded mail from [EMAIL PROTECTED]

we have been struggling for several months now trying to understand how to
use CVS in an integrated development environment, i.e. development, QA, and
production.

- should development commit changes to the main HEAD or in a development
"branch"?
- does a QA department have their own branch or do they use the development
branch?
- how are revisions moved from development and QA? do you merge to and from?
- should versions be tagged when they are released or tagged every step of
the way?

the greatest help would come from someone explaining exactly how their
company uses CVS. any help would be greatly -- GREATLY -- appreciated.

--- End of forwarded message from [EMAIL PROTECTED]

If I understand your question properly, you're asking how various shops
perform the hand-off from development to Q/A.  You seem to recognize that
the stuff Q/A wants is not necessarily the latest work completed by the
developers.

One method that I've seen used very successfully with CVS is what I call
the release/integrate or submit/assemble method, which is a type of change
control.  The way it works is that the developers identify sets of files
(call them "changes") that are eligible for the next build.  These changes
accumulate between builds, and are used by the build team (in combination
with the contents of the prior build) to assemble a new build area.  The
result is compiled and supplied to Q/A for testing.

If the build fails, individual changes can be removed, and the updated
build area is cleaned and recompiled.  This recovery can sometimes be
automated (depending on the nature of the build and how much it can be
modified to accomodate this type of analysis).  It helps a lot to have
the build process make multiple passes (per subsystem, as opposed to the
traditional recursive Make that builds tools then headers then libraries
then executables) and track which files are created during each pass,
the build process never modifies any source file, and the build process
records sufficient information in the logs to identify specific failures
and trace them back to source files.  It's also helpful if the build
process records any files used by an include mechanism by the source
files identified to contain errors.