Re: cvs update $Name: $ expansion
[EMAIL PROTECTED] wrote: > I can't get $Name: $ to expand on an update in my script below. > It works when checking out. But, do I really have to do a checkout? I think it works on update, *if* the working copy is missing and the update has to get a new copy from scratch. (And, of course, if the sandbox has a sticky revision tag.) So if you use $Name$ in a single file, you can get that file to expand correctly without having to check out the entire project. -- pa at panix dot com ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
Re: cvs update $Name: $ expansion
> I want some sort of build identifier attached to the source I am > building every night. Then tag your sources every night in eg astronomical time rev20050623 for July 23rd. > $Name:$ seems logical and it does seem like the way other people do it, > albeit with a checkout. Yes, it only gets expanded on checkout: from info cvs: `$Name$' Tag name used to check out this file. The keyword is expanded only if one checks out with an explicit tag name. For example, when running the command `cvs co -r first', the keyword expands to `Name: first'. And you don't want users to check out the whole source tree. But if you tag your regular build, users can update their sources with cvs update -r rev20050623 and less stuff will get sent over the network and they'll be running with the 20050623 'nightly build'. They won't be able to check in changes to this since it's a non-branch tag, but they will be able to try out nightly snapshots in this way. cvs update -A will remove the sticky tag and bring them up to HEAD when they need to do that. So you associate the build identifier to your source tree through the tag. Users won't get much clue looking at the source files themselves, CVS/Entries in each directory will show that they've checked out the rev20050623 tag however. Hope this helps, Stuart. ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
Re: cvs update $Name: $ expansion
I want some sort of build identifier attached to the source I am building every night. $Name:$ seems logical and it does seem like the way other people do it, albeit with a checkout. ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
Re: cvs update $Name: $ expansion
> I can't get $Name: $ to expand on an update in my script below. > It works when checking out. But, do I really have to do a checkout? > Because a clean checkout every night would be expensive over a crappy > connection. > debian$ cat test.sh > DATE=`date +%s` > TAG=test_$DATE > MODULE='t' > echo Tagging module: $MODULE with tag: $TAG > # Snapshot the module in the repo > cvs rtag $TAG $MODULE > # Updating to that snapshot > cvs update -r $TAG > tag="$Name: $" > echo $tag |sed 's/^.*: //;s/ .*$//' You're very mixed up here. The whole point of $Name: $ is you put them in your source files and they get automagically transformed for you on checkin and checkout. You don't use them as tag names and you shouldn't be doing sed magic by yourself. Common idiom (in say a Perl project) #!/usr/bin/perl # $Id$ use DBI; ...etc etc rest of script goes here After the next checkin/checkout you get some nice info on the state of the file #!/usr/bin/perl # $Id: newDSLTests.pl,v 1.19 2005/04/15 04:00:58 scooper Exp $ use DBI; There's a trick in C programming, something like static char RCSId[]="$Id$"; and it gets compiled into the executable so it can later be found as a string in the executable so you know what versions made up your compiled software. Take a few steps back and think about what $Id$, $Name$ are all about. Have fun, Stuart. ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
cvs update $Name: $ expansion
I can't get $Name: $ to expand on an update in my script below. It works when checking out. But, do I really have to do a checkout? Because a clean checkout every night would be expensive over a crappy connection. debian$ cat test.sh DATE=`date +%s` TAG=test_$DATE MODULE='t' echo Tagging module: $MODULE with tag: $TAG # Snapshot the module in the repo cvs rtag $TAG $MODULE # Updating to that snapshot cvs update -r $TAG tag="$Name: $" echo $tag |sed 's/^.*: //;s/ .*$//' ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
cvs update locked
Hi, I am having trouble updating. I can't even access the CVS directory. Any ideas? [EMAIL PROTECTED] asdf]$ cvs update cvs [update aborted]: cannot remove file CVS/Entries.Static: Permission denied [EMAIL PROTECTED] asdf]$ ls -la CVS total 0 ?- ? ? ? ? ? . ?- ? ? ? ? ? .. ?- ? ? ? ? ? Entries ?- ? ? ? ? ? Repository ?- ? ? ? ? ? Root [EMAIL PROTECTED] asdf]$ ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
Re: CVS update -j failes to merge
On Wed, May 18, 2005 at 12:53:03PM -0400, Jim Hyslop wrote:
> Asbjørn Sæbø wrote:
> >On Fri, May 13, 2005 at 03:58:12PM -0400, Jim Hyslop wrote:
> >>What version of client and server are you using?
> >
> >
> >Both are 1.12.9
>
> Hmmm... I just tried it with 1.12.12, and it worked OK. Can you upgrade
> to the latest versions and try again?
Now I have tested again, on clean checkouts, with both 1.12.9 and
1.12.12. The results seem to indicate a difference between these two
versions. With 1.12.12, the expected merging takes place, with 1.12.9
it does not.
Actually, it seems that what makes the difference is whether the client
is 1.12.12 or not (see below). When the client is 1.12.12, the merging
I am expecting takes place. When the client is 1.12.9, it does not.
(It should be mentioned that I am not totally certain that my repository
is sound. I installed cvs the normal way ("apt-get install" on a
Debian-based box). But the actual ldas module is just copied to this
server from another one. It seems to work, but I am not sure whether
this is the formally correct way to transfer a module to another
server.)
Procedure:
--
rm -rf ldas
cvs co ldas
cvs update -j dev_20050413_b ldas
The output from the "update -j" command is shown below. (The output is
truncated for the cases where merging took place.)
Case 1:
---
client: cvs 1.12.9
server: 1.12.9
[EMAIL PROTECTED]:~/tmp/tmp$ cvs update -j dev_20050413_b ldas
cvs update: Updating ldas
cvs update: Updating ldas/doc
cvs update: Updating ldas/doc/doxygen
cvs update: Updating ldas/doc/ldasdoc
cvs update: Updating ldas/doc/ldasdoc/developer
cvs update: Updating ldas/doc/ldasdoc/reference
cvs update: Updating ldas/doc/ldasdoc/spec
cvs update: Updating ldas/doc/ldasdoc/usermanual
cvs update: Updating ldas/extracode
cvs update: Updating ldas/orig_src
cvs update: Updating ldas/src
cvs update: Updating ldas/testcode
[EMAIL PROTECTED]:~/tmp/tmp$
Case 2:
---
client: cvs 1.12.12
server: 1.12.12
[EMAIL PROTECTED]:~/tmp/tmp$ cvs update -j dev_20050413_b ldas
cvs update: Updating ldas
RCS file: /local/cvs/ldas/Tags,v
retrieving revision 1.17
retrieving revision 1.17.2.2
Merging differences between 1.17 and 1.17.2.2 into Tags
rcsmerge: warning: conflicts during merge
cvs update: Updating ldas/doc
[...]
cvs update: Updating ldas/doc/ldasdoc/reference
cvs update: Updating ldas/doc/ldasdoc/spec
RCS file: /local/cvs/ldas/doc/ldasdoc/spec/specification.tex,v
retrieving revision 1.6
retrieving revision 1.6.4.1
Merging differences between 1.6 and 1.6.4.1 into specification.tex
ldas/doc/ldasdoc/spec/specification.tex already contains the differences
between 1.6 and 1.6.4.1
[More merging]
Case 3:
---
Client: 1.12.12
Server: 1.12.9
[EMAIL PROTECTED]:~/tmp/tmp$ cvs update -j dev_20050413_b ldas
cvs update: Updating ldas
RCS file: /local/cvs/ldas/Tags,v
retrieving revision 1.17
retrieving revision 1.17.2.2
Merging differences between 1.17 and 1.17.2.2 into Tags
rcsmerge: warning: conflicts during merge
cvs update: Updating ldas/doc
[...]
cvs update: Updating ldas/doc/ldasdoc/spec
RCS file: /local/cvs/ldas/doc/ldasdoc/spec/specification.tex,v
retrieving revision 1.6
retrieving revision 1.6.4.1
Merging differences between 1.6 and 1.6.4.1 into specification.tex
ldas/doc/ldasdoc/spec/specification.tex already contains the differences
between 1.6 and 1.6.4.1
[More merging]
Case 4:
---
Client: 1.12.9
Server: 1.12.12
[EMAIL PROTECTED]:~/tmp/tmp$ cvs update -j dev_20050413_b ldas
cvs update: Updating ldas
cvs update: Updating ldas/doc
cvs update: Updating ldas/doc/doxygen
cvs update: Updating ldas/doc/ldasdoc
cvs update: Updating ldas/doc/ldasdoc/developer
cvs update: Updating ldas/doc/ldasdoc/reference
cvs update: Updating ldas/doc/ldasdoc/spec
cvs update: Updating ldas/doc/ldasdoc/usermanual
cvs update: Updating ldas/extracode
cvs update: Updating ldas/orig_src
cvs update: Updating ldas/src
cvs update: Updating ldas/testcode
[EMAIL PROTECTED]:~/tmp/tmp$
Asbjørn
___
Info-cvs mailing list
Info-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/info-cvs
Re: CVS update -j failes to merge
Asbjørn Sæbø wrote: On Fri, May 13, 2005 at 03:58:12PM -0400, Jim Hyslop wrote: What version of client and server are you using? Both are 1.12.9 Hmmm... I just tried it with 1.12.12, and it worked OK. Can you upgrade to the latest versions and try again? -- Jim ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
Re: CVS update -j failes to merge
On Fri, May 13, 2005 at 03:58:12PM -0400, Jim Hyslop wrote: > Asbjørn Sæbø wrote: > >On Fri, May 13, 2005 at 10:04:59AM +0200, Asbjørn Sæbø wrote: [Updating/merging did not work from outside the module/directory, but worked from inside the directory. ] > >>[EMAIL PROTECTED]:~/ldas/utvikling$ cvs update -j dev_20050413_b ldas [Did not merge] > >[EMAIL PROTECTED]:~/ldas/utvikling/ldas$ cvs update -j dev_20050413_b . [Worked, did merge] > >[Much retrieving and merging] > > > >Is this difference between naming the module/directory and standing in > >the module/directory expected behaviour? > No. I just tried it with cvs 1.11.20, and it worked OK: > > [...] > What version of client and server are you using? Both are 1.12.9 Asbjørn ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
Re: CVS update -j failes to merge
Asbjørn Sæbø wrote: On Fri, May 13, 2005 at 10:04:59AM +0200, Asbjørn Sæbø wrote: I have a CVS module (named "ldas") where I would like to merge the contents of a branch into the trunk. According to the documentation, is seems that I should be able to du this using "cvs update -j ". However, this does not work. No merging takes place, the files on the trunk do not receive the changes from the branch. [...] [EMAIL PROTECTED]:~/ldas/utvikling$ cvs update -j dev_20050413_b ldas However, when I changed into the ldas directory, and did the update, it worked: [EMAIL PROTECTED]:~/ldas/utvikling$ cd ldas [EMAIL PROTECTED]:~/ldas/utvikling/ldas$ cvs update -j dev_20050413_b . [Much retrieving and merging] Is this difference between naming the module/directory and standing in the module/directory expected behaviour? No. I just tried it with cvs 1.11.20, and it worked OK: C:\cvs-test\jim>cvs -d \cvs_repository tag -r brach_base -b abranch cvs tag: Tagging . T test.txt C:\cvs-test\jim>cvs up -r abranch cvs update: Updating . C:\cvs-test\jim>echo branch changes>>test.txt C:\cvs-test\jim>cvs ci -m "branch changes" test.txt Checking in test.txt; \cvs_repository/cvs-test/jim/test.txt,v <-- test.txt new revision: 1.2.2.1; previous revision: 1.2 done C:\cvs-test>cvs up -A jim cvs update: Updating jim U jim/test.txt C:\cvs-test>cvs up -j abranch jim cvs update: Updating jim RCS file: \cvs_repository/cvs-test/jim/test.txt,v retrieving revision 1.2 retrieving revision 1.2.2.1 Merging differences between 1.2 and 1.2.2.1 into test.txt What version of client and server are you using? -- Jim ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
Re: CVS update -j failes to merge
On Fri, May 13, 2005 at 10:04:59AM +0200, Asbjørn Sæbø wrote: > I have a CVS module (named "ldas") where I would like to merge the > contents of a branch into the trunk. According to the documentation, > is seems that I should be able to du this using "cvs update -j > ". However, this does not work. No merging takes place, > the files on the trunk do not receive the changes from the branch. > [...] > [EMAIL PROTECTED]:~/ldas/utvikling$ cvs update -j dev_20050413_b ldas However, when I changed into the ldas directory, and did the update, it worked: [EMAIL PROTECTED]:~/ldas/utvikling$ cd ldas [EMAIL PROTECTED]:~/ldas/utvikling/ldas$ cvs update -j dev_20050413_b . [Much retrieving and merging] Is this difference between naming the module/directory and standing in the module/directory expected behaviour? Asbjørn -- Asbjørn Sæbø, post.doc. Centre for Quantifiable Quality of Service in Communication Systems Norwegian University of Science and Technology http://www.q2s.ntnu.no/ > ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
CVS update -j failes to merge
I have a CVS module (named "ldas") where I would like to merge the contents of a branch into the trunk. According to the documentation, is seems that I should be able to du this using "cvs update -j ". However, this does not work. No merging takes place, the files on the trunk do not receive the changes from the branch. (See example at the bottom, where "dev_20050413_b" is the tag of the branch I would like to merge.) I have noted something that may be related to this problem: When doing a "cvs status", I get an error message. However, the status command still seems to work well: -- [EMAIL PROTECTED]:~/ldas/utvikling$ cvs status ldas/src/ldas_receiver.c cvs [status aborted]: no such directory `ldas/src' === File: ldas_receiver.c Status: Up-to-date Working revision:1.36 Repository revision: 1.36/local/cvs/ldas/src/ldas_receiver.c,v Sticky Tag: (none) Sticky Date: (none) Sticky Options: (none) I have done some hours of RTFM and FAQ/archive reading, but have not been able to solve this. Does anyone have any suggestions to what it is that is wrong here? With kind regards Asbjørn Sæbø [EMAIL PROTECTED]:~/ldas/utvikling$ cvs update -A ldas cvs update: Updating ldas cvs update: Updating ldas/doc cvs update: Updating ldas/doc/doxygen cvs update: Updating ldas/doc/ldasdoc cvs update: Updating ldas/doc/ldasdoc/developer cvs update: Updating ldas/doc/ldasdoc/reference cvs update: Updating ldas/doc/ldasdoc/spec cvs update: Updating ldas/doc/ldasdoc/usermanual cvs update: Updating ldas/extracode cvs update: Updating ldas/orig_src cvs update: Updating ldas/src cvs update: Updating ldas/testcode [EMAIL PROTECTED]:~/ldas/utvikling$ cvs update -j dev_20050413_b ldas cvs update: Updating ldas cvs update: Updating ldas/doc cvs update: Updating ldas/doc/doxygen cvs update: Updating ldas/doc/ldasdoc cvs update: Updating ldas/doc/ldasdoc/developer cvs update: Updating ldas/doc/ldasdoc/reference cvs update: Updating ldas/doc/ldasdoc/spec cvs update: Updating ldas/doc/ldasdoc/usermanual cvs update: Updating ldas/extracode cvs update: Updating ldas/orig_src cvs update: Updating ldas/src cvs update: Updating ldas/testcode [EMAIL PROTECTED]:~/ldas/utvikling$ -- Asbjørn Sæbø, post.doc. Centre for Quantifiable Quality of Service in Communication Systems Norwegian University of Science and Technology http://www.q2s.ntnu.no/ > ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
RE: About the cvs update error
Thank you for your reply. First I think it also a hardware problem. But the other person checkout the same module and execute the same command there is no error prompt. On opposition , I grant the guog user checkout other module also there is the same error. In a word, there is a problem with the user. But I view the passwd file,the configuration file the same as other user zhangjh:X:7110:203:User information ,telephone information:/user/zhangjh:/usr/bin/ksh guog:X:7111:203:User information ,telephone information:/user/guog:/usr/bin/ksh Actually the /user/guog and /user/zhangjh both didn't exist. I descript the configuration can you give me some suggestion. -Original Message- From: Larry Jones [mailto:[EMAIL PROTECTED] Sent: Wednesday, April 27, 2005 2:03 PM To: Zhang, Jian-He (David,TSG-GDCC-SH) Cc: info-cvs@gnu.org Subject: Re: About the cvs update error Zhang, Jian-He writes: > > cvs update -P -C "Headcount - 2H 05.xls" (in directory > C:\MyHouse\cvshome\Test\) > cvs server: cannot open /user/guog/.cvsignore: I/O error Usually I/O errors imply a hardware problem of some sort. If that's an NFS-mounted directory, you might have a network problem or a problem with the NFS server. If not, you probably have a disk that's going bad. -Larry Jones Mom must've put my cape in the wrong drawer. -- Calvin ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
Re: About the cvs update error
Zhang, Jian-He writes: > > cvs update -P -C "Headcount - 2H 05.xls" (in directory > C:\MyHouse\cvshome\Test\) > cvs server: cannot open /user/guog/.cvsignore: I/O error Usually I/O errors imply a hardware problem of some sort. If that's an NFS-mounted directory, you might have a network problem or a problem with the NFS server. If not, you probably have a disk that's going bad. -Larry Jones Mom must've put my cape in the wrong drawer. -- Calvin ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
About the cvs update error
AnyOne ever encounter the following error message when execute the cvs update action: cvs update -P -C "Headcount - 2H 05.xls" (in directory C:\MyHouse\cvshome\Test\) cvs server: cannot open /user/guog/.cvsignore: I/O error * CVS exited normally with code 0 * I checked the user guog's configuration and the repository configuration,but I got nothing. Sometimes he can execute update successfully with error message,sometimes he can't execute update, Anyone can tell me why? Thanks. Best Regards! Zhang, Jianhe(David) Global Delivery China Center Tel: +86-21-2898-3481 ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
Re: cvs update not handling binary files with conflicts correctly
[...] When the update command is run it says that there is a conflict in the WORD.tar (binary file). But when I ran cvs -nq update after the changes are merged it shows that the Binary file has no conflicts. It is supposed to mark it with a 'C' right? CVS already told you... $ cvs -f up -d -kk -j TAG1 -j TAG2 WORD.tar test9.txt cvs update: nonmergeable file needs merge cvs update: revision 1.1.2.2 from repository is now in WORD.tar cvs update: file from working directory is now in .#WORD.tar.1.1.4.2 Which basically means that the WORD.tar revision is now the same as in the repository. If you want to create your conflict again, do a $ mv .#WORD.tar.1.1.4.2 WORD.tar and run cvs up Arno np: Marillion - The Fruit Of The Wild Rose ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
cvs update not handling binary files with conflicts correctly
I have two files with conflicts. One a binary file and another an ASCII file. Binary file: WORD.tar ASCII file: test9.txt - # Before merge $ cat CVS/Entries | egrep 'WOR|test9.txt' /WORD.tar/1.1.4.2/Fri Apr 8 20:17:35 2005/-kb/TMY_BRANCH /test9.txt/1.1.4.2/Fri Apr 8 20:17:35 2005/-kk/TMY_BRANCH $ cvs -f up -d -kk -j TAG1 -j TAG2 WORD.tar test9.txt cvs update: nonmergeable file needs merge cvs update: revision 1.1.2.2 from repository is now in WORD.tar cvs update: file from working directory is now in .#WORD.tar.1.1.4.2 C WORD.tar RCS file: /usr/local/cvs/archive/tools_test/pat/Attic/test9.txt,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 Merging differences between 1.1.2.1 and 1.1.2.2 into test9.txt rcsmerge: warning: conflicts during merge # After merge $ cat CVS/Entries | egrep 'WOR|test9.txt' /WORD.tar/1.1.4.2/Result of merge/-kb/TMY_BRANCH /test9.txt/1.1.4.2/Result of merge+Fri Apr 8 20:18:16 2005/-kk/TMY_BRANCH $ cvs -nq up WORD.tar test9.txt M WORD.tar C test9.txt $ ls -la .#WORD.tar.1.1.4.2 WORD.tar test9.txt -rw-r--r--1 userid ftp50 Apr 8 16:18 test9.txt -rw-r--r--1 userid ftp 40960 Apr 8 16:18 WORD.tar -rw-r--r--1 userid ftp 10240 Apr 8 16:17 .#WORD.tar.1.1.4.2 $ cvs version Client: Concurrent Versions System (CVS) 1.11.1p1 (client/server) Server: Concurrent Versions System (CVS) 1.11.17 (client/server) - When the update command is run it says that there is a conflict in the WORD.tar (binary file). But when I ran cvs -nq update after the changes are merged it shows that the Binary file has no conflicts. It is supposed to mark it with a 'C' right? Thanks SG ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
RE: cvs update -A doesn't work . . . ?
Christopher Currie wrote: >cvs on our server is version 1.3.2.03, and on our client > machines, the > version is: 1.3.20.3 Beta (Build 3), WINCVS. Thanks Jim. > > - Christopher > > P.S. > I've been using the command line interface of WINCVS to run cvs > commands. WinCVS uses CVSNT, not CVS (there is a difference). I'm afraid we're not going to be much help for you. For CVSNT support, you should go to www.cvsnt.com Except that it seems to be down at the moment :=( -- 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 Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
RE: cvs update -A doesn't work . . . ?
Jim, cvs on our server is version 1.3.2.03, and on our client machines, the version is: 1.3.20.3 Beta (Build 3), WINCVS. Thanks Jim. - Christopher P.S. I've been using the command line interface of WINCVS to run cvs commands. -Original Message- From: Jim.Hyslop [mailto:[EMAIL PROTECTED] Sent: Tuesday, April 05, 2005 1:39 PM To: '[EMAIL PROTECTED]'; Robert Helmer Cc: info-cvs@gnu.org Subject: RE: cvs update -A doesn't work . . . ? Christopher Currie wrote: > Robert -- the output of 'status,' 'update,' 'status,' and > then a final try > at commiting the file is below. [...] > === > File: shopnav.ascxStatus: Locally Modified > >Working revision: 1.8 >Repository revision: 1.8 > \cvsrepo_web/Development/common/shopnav.ascx,v >Sticky Tag:1.8 >Sticky Date: (none) >Sticky Options:(none) > > cvs up -A shopnav.ascx > > * CVS exited normally with code 0 * > > M shopnav.ascx > > cvs status shopnav.ascx > > > * CVS exited normally with code 0 * > > === > File: shopnav.ascxStatus: Locally Modified > >Working revision: 1.8 >Repository revision: 1.8 > \cvsrepo_web/Development/common/shopnav.ascx,v >Sticky Tag:1.8 >Sticky Date: (none) >Sticky Options:(none) Something is definitely wrong here. At this point, "Sticky Tag" should say "(none)". What is generating the "* CVS exited ... " messages? Those are not generated by CVS. Which version of CVS are you running (both on the client and on the server)? -- 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 Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
RE: cvs update -A doesn't work . . . ?
Christopher Currie wrote: > Robert -- the output of 'status,' 'update,' 'status,' and > then a final try > at commiting the file is below. [...] > === > File: shopnav.ascxStatus: Locally Modified > >Working revision: 1.8 >Repository revision: 1.8 > \cvsrepo_web/Development/common/shopnav.ascx,v >Sticky Tag:1.8 >Sticky Date: (none) >Sticky Options:(none) > > cvs up -A shopnav.ascx > > * CVS exited normally with code 0 * > > M shopnav.ascx > > cvs status shopnav.ascx > > > * CVS exited normally with code 0 * > > === > File: shopnav.ascxStatus: Locally Modified > >Working revision: 1.8 >Repository revision: 1.8 > \cvsrepo_web/Development/common/shopnav.ascx,v >Sticky Tag:1.8 >Sticky Date: (none) >Sticky Options:(none) Something is definitely wrong here. At this point, "Sticky Tag" should say "(none)". What is generating the "* CVS exited ... " messages? Those are not generated by CVS. Which version of CVS are you running (both on the client and on the server)? -- 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 Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
RE: cvs update -A doesn't work . . . ?
Robert -- the output of 'status,' 'update,' 'status,' and then a final try at commiting the file is below. By 'doesn't do a thing,' I mean that the status of the file doesn't seem to change nor can I commit the file. I'm new to cvs, and I've been reading the documentation and the cvs book (by Jennifer Vesperman), but I'm still quite lost about what the problem is exactly. Thanks Robert. - Christopher -Original Message- From: Robert Helmer [mailto:[EMAIL PROTECTED] Sent: Tuesday, April 05, 2005 12:59 PM To: Christopher Currie Cc: info-cvs@gnu.org Subject: Re: cvs update -A doesn't work . . . ? On Tue, Apr 05, 2005 at 11:49:00AM -0400, Christopher Currie wrote: > I'm trying to commit a file that has a sticky tag: > > cvs server: sticky tag `1.8' for file `shopnav.ascx' is not a branch > cvs [server aborted]: correct above errors first! > > From all the documentaton I have, I read that the way to clear the sticky > tag was to do a: > > cvs update -A > > but this doesn't do a thing. What do you mean by "doesn't do a thing"? No output, does not change the situation, ? You can see current sticky tags on a file with "cvs status file", and update just that file to the trunk using "cvs update -A file". Are you sure you are in the right directory, and are operating on a CVS module that's been checked out (e.g. not one directory up)? Please send the full output of these commands: cvs status file cvs up -A file cvs status file -- Rob +-- REQUESTED OUTPUT --+ cvs status shopnav.ascx * CVS exited normally with code 0 * === File: shopnav.ascx Status: Locally Modified Working revision:1.8 Repository revision: 1.8 \cvsrepo_web/Development/common/shopnav.ascx,v Sticky Tag: 1.8 Sticky Date: (none) Sticky Options: (none) cvs up -A shopnav.ascx * CVS exited normally with code 0 * M shopnav.ascx cvs status shopnav.ascx * CVS exited normally with code 0 * === File: shopnav.ascx Status: Locally Modified Working revision:1.8 Repository revision: 1.8 \cvsrepo_web/Development/common/shopnav.ascx,v Sticky Tag: 1.8 Sticky Date: (none) Sticky Options: (none) cvs -z9 commit -m shopnav.ascx cvs server: sticky tag `1.8' for file `shopnav.ascx' is not a branch cvs [server aborted]: correct above errors first! ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
RE: cvs update -A doesn't work . . . ?
Christopher Currie wrote: > I'm trying to commit a file that has a sticky tag: > > cvs server: sticky tag `1.8' for file `shopnav.ascx' is > not a branch > cvs [server aborted]: correct above errors first! > > From all the documentaton I have, I read that the way to > clear the sticky tag was to do a: > > cvs update -A > > but this doesn't do a thing. Are you sure? What does 'cvs stat shopnav.ascx' report, right after 'cvs update -A'? -- 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 Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
cvs update -A doesn't work . . . ?
Dear all, I'm trying to commit a file that has a sticky tag: cvs server: sticky tag `1.8' for file `shopnav.ascx' is not a branch cvs [server aborted]: correct above errors first! From all the documentaton I have, I read that the way to clear the sticky tag was to do a: cvs update -A but this doesn't do a thing. The other thing to try is to convert the tag into a branch, but I don't really want/need a new branch. Any advice/help would be great. Thanks. ChrIstoPher CurrIe [EMAIL PROTECTED]wEb deSiGner tEl : +212 625 8989 eXt 237www.yrb.us efAX: +419 828-1840 laT : 40° 47' NSoHo neW yOrk cIty lonG: 73° 58' W ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
CVS update and FTP
Hello all, I tried using CVSviaFTP, but it didn't work out and it isn't maintained anymore. Does anyone know of any script that either 1) outputs a ftp command file for all files that changed 2) uploads the changed files right away to a ftp server Any help would be greatly appreciated. Thanks, Phil ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
RE: cvs update: move away ; it is in the way
Rachel Suddeth wrote: > Oh nevermind. I see there is an uncontrolled file by the same > name in the > sandbox. Glad we could help :=) BTW, with respect to this question: > > I'm not sure how > to say if a > > message came from CVSNT client, or the server running under > Linux the first part of the message tells you where it originated: > >> cvs server: Updating BhCtrl/BHTypes "cvs server" - the server generated the message. -- 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://lists.gnu.org/mailman/listinfo/info-cvs
Re: cvs update: move away ; it is in the way
Hello, * On Thu, Dec 09, 2004 at 08:27:40AM -0600 Rachel Suddeth wrote: > I got this in output window from WinCVS. I'm not sure how to say if a > message came from CVSNT client, or the server running under Linux but > I'm guessing server since path has "/", not "\" in it... > >cvs server: Updating BhCtrl/BHTypes > >cvs update: move away BhCtrl/BHTypes/BHTypes.csproj; it is in the way. You want to checkout (or, in this case, update) the file BhCtrl/BHTypes/BHTypes.csproj from the repository, but this file is already in your sandbox. Unfortunately, the file is not under control of CVS. Thus, CVS does not want to overwrite it, as you might loose the file if it is totally different to what is checked out here. Have you copied the file "by hand" into the sandbox? You can rename the file BHTypes.csproj to something different and look what CVS checks out for you. Furthermore, I have seen this problem on the CVSHOME version of CVS on Windows systems if there are files in the repository which differ only in the case. Well, IIRC, it was more if there are directories which only differ by case. For more details, see the thread I started here Date: Sun, 18 Apr 2004 18:37:32 +0200 Subject: Windows with Dir/ and dir/ From: Spiro Trikaliotis <[EMAIL PROTECTED]> Message-ID: <[EMAIL PROTECTED]> (sorry, the archive does not work now, so I cannot give you an URL) HTH, Spiro. -- Spiro R. Trikaliotis http://www.trikaliotis.net/ http://www.viceteam.org/ ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: cvs update: move away ; it is in the way
Oh nevermind. I see there is an uncontrolled file by the same name in the sandbox. (Not sure how that happened... fortunately I didn't make any changes in that module yesterday, so nothing should be messed up.) - Original Message - From: "Rachel Suddeth (Bloodhound Software)" <[EMAIL PROTECTED]> To: <[EMAIL PROTECTED]> Sent: Thursday, December 09, 2004 8:27 AM Subject: cvs update: move away ; it is in the way I don't know what this means, and haven't found it in FAQs or by searching archives (most of the words in it I think get tossed out by basic searches.) Actually, it was in one WinCVS FAQ, but the entry said "sorry not yet." I got this in output window from WinCVS. I'm not sure how to say if a message came from CVSNT client, or the server running under Linux but I'm guessing server since path has "/", not "\" in it... cvs server: Updating BhCtrl/BHTypes cvs update: move away BhCtrl/BHTypes/BHTypes.csproj; it is in the way. Can anyone tell me what causes that? Thanks, Rachel __ Roydan Enterprises Ltd 602 North 9th Street Manitowoc, WI 54220-3924 1-800-236-6906 (920)-684-3688 Fax: (920)-684-3630 ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
cvs update: move away ; it is in the way
I don't know what this means, and haven't found it in FAQs or by searching archives (most of the words in it I think get tossed out by basic searches.) Actually, it was in one WinCVS FAQ, but the entry said "sorry not yet." I got this in output window from WinCVS. I'm not sure how to say if a message came from CVSNT client, or the server running under Linux but I'm guessing server since path has "/", not "\" in it... cvs server: Updating BhCtrl/BHTypes cvs update: move away BhCtrl/BHTypes/BHTypes.csproj; it is in the way. Can anyone tell me what causes that? Thanks, Rachel __ Roydan Enterprises Ltd 602 North 9th Street Manitowoc, WI 54220-3924 1-800-236-6906 (920)-684-3688 Fax: (920)-684-3630 ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: cvs-update triggers
Paul, Use the "precommand" (or "postcommand") trigger. http://www.cvsnt.org/manual/postcommand.html This is only available in CVSNT 2.0.58 and later. CVSNT is free (GPL - just like CVS) is available on Linux, Unix, Windows, Mac OS X etc etc. If you are using WinCVS or TortoiseCVS then you are already using it (it comes bundled with those). Since the triggers are executed on the server then you will need to be running CVSNT on the server. http://www.cvsnt.com Regards, Arthur Barrett <[EMAIL PROTECTED]> wrote in message news:[EMAIL PROTECTED] > hello, > i would like to setup a trigger for when cvs-update touches a file (updates or merges) in checked out work areas. is there already a mechanism for this? i want it to run a script or set of commands > my specific need is that i want to have a shell-rc file in the repository, when someone makes changes to it and then i do an update, i get those changes and therefore would like to re-source that file and update my shell. is this possible to set-up? > thanks > paul > > > ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: cvs-update triggers
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 [EMAIL PROTECTED] writes: > i would like to setup a trigger for when cvs-update touches a file > (updates or merges) in checked out work areas. is there already a > mechanism for this? No. The Set-update-prog feature was removed for cvs 1.11.6. It is a potential security vulnerability to have a cvs update run commands on your behalf that someone else has defined. > i want it to run a script or set of commands my specific need is that > i want to have a shell-rc file in the repository, when someone makes > changes to it and then i do an update, i get those changes and > therefore would like to re-source that file and update my shell. is > this possible to set-up? thanks paul I'd suggest creating a 'make update' command or something similar that captures the output of the 'cvs update' and post-processes it in whatever way makes you happy. Good luck, -- Mark -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.3 (FreeBSD) iD8DBQFBeSmc3x41pRYZE/gRAru5AKCUQhOGSB2LImG2SVYTHXk57OYJ0gCfepfZ a20KAN3gXLb9n3UiAjZ4rio= =jWfH -END PGP SIGNATURE- ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
cvs-update triggers
hello, i would like to setup a trigger for when cvs-update touches a file (updates or merges) in checked out work areas. is there already a mechanism for this? i want it to run a script or set of commands my specific need is that i want to have a shell-rc file in the repository, when someone makes changes to it and then i do an update, i get those changes and therefore would like to re-source that file and update my shell. is this possible to set-up? thanks paul ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: The cvs update feature
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Daniel Sadoc <[EMAIL PROTECTED]> writes: > Hi people, > > Please, I would like to know if there is a way to disable the "cvs > update" feature. No. > I think that in many cases the "merge" is very dangerous, specially > when people do it mechanically without running, for instance, "cvs > log" first. The original, unmodified file is still in the updated directory after the primary file has been patched. It is called .#. in the same directory as the file. > But I don't know if disabling "cvs update" is the best solution in > order to guarantee the consistency. cvs works fine. If it does not do what you expect, then it may be you are attempting to use the wrong tool or have misconfigured it for some file types that do not lend themselves to being merged by diff3. For those file types you might consider updates to the CVSROOT/cvswrappers file. > Are there other possibilities in order to avoid pitfalls? Consider reading the manual. Consider asking a question that actually provides your readers with sufficient understanding about why a cvs update is considered dangerous by you. You could consider some tool other than cvs. -- Mark -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.3 (FreeBSD) iD8DBQFBc92N3x41pRYZE/gRAkDqAJ4poyo5CqXAYjnnPExjkEmBG3s56QCgtKZT c13YoD5JQjwTGuu2DJzekFE= =5vq3 -END PGP SIGNATURE- ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
The cvs update feature
Hi people, Please, I would like to know if there is a way to disable the "cvs update" feature. I think that in many cases the "merge" is very dangerous, specially when people do it mechanically without running, for instance, "cvs log" first. But I don't know if disabling "cvs update" is the best solution in order to guarantee the consistency. Are there other possibilities in order to avoid pitfalls? Regards, Daniel Sadoc ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Cvs update - file was lost
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Erik Andersson <[EMAIL PROTECTED]> writes: > I'm a little worried of one of the warnings when I did a update on a > module. > > We recieved a few warnings like: > > cvs update: warning: filename was lost > U filename The message arises when the information in the CVS/Entries* file(s) have an entry for 'filename' and 'filename is not in the current directory. > I understand that you recieve this error messenge if you delete a file > in your local sandbox and then do a cvs update. Correct. > But if the developer is absolutly sure that he hasn't deleted any > local files, what could be the cause of this warning? Filesystem corruption? Someone else removed the file? Some process removed the file? > Am I to be worried about the state of the repository? No, the repository state is unrelated to the state of the users local CVS/* files. > Please help me out. You should be able to use the source to cvs to prove what happens. The src/classify.c file in the Classify_File function is where the message is generated. Look at the code yourself and see if you can find any other way to get the message you have seen. -- Mark -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.3 (FreeBSD) iD8DBQFBW79Y3x41pRYZE/gRAi0DAJ0Smywf/U2t1Mhkzs1yk5xkyWXQswCgmOFg Y5geGG/AjmkHEeKP5T5/g8Y= =oN+q -END PGP SIGNATURE- ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Cvs update - file was lost
Hi I'm a little worried of one of the warnings when I did a update on a module. We recieved a few warnings like: cvs update: warning: filename was lost U filename I understand that you recieve this error messenge if you delete a file in your local sandbox and then do a cvs update. But if the developer is absolutly sure that he hasn't deleted any local files, what could be the cause of this warning? Am I to be worried about the state of the repository? Please help me out. Best Regards / Erik ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
cvs update with directory path failed
Hi In windows 2000, I get a "permission denied" when a directory path is given to update command. [cvswork/proj/rtl/module/mem/cntrl]> ls thisfile.v now, [cvswork/proj/rtl/module/mem/cntrl]> cvs update thisfile.v [cvswork/proj/rtl/module/mem/cntrl]> cvs update ../cntrl/thisfile.v both works fine. but; [cvswork/proj/rtl/module/mem/cntrl]> cvs update ../../mem/cntrl/thisfile.v Permission denied That is only message I get. I read through some previous questions about "premission denied" and tried to reassign temp directories (thought that might be the case) re-defined; export TMPDIR=/cygdrive/c/tmp export TMP=/cygdrive/c/tmp export TEMP=/cygdrive/c/tmp and did; chmod go+w /cygdrive/c/tmp but didn't help. Please Help! This problem doesn't show up in Linux. Thanks In Advance, Rejeesh ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: cvs update from a remote machine with a full path
Ashwini S. Thirunahari writes: > > If am NOT rsh ing, CVS accepts complete path. But with rsh, CVS has an > issue? Correct. Long-standing problem, very hard to fix. Don't do that. -Larry Jones These findings suggest a logical course of action. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
RE: cvs update from a remote machine with a full path
Ashwini S. Thirunahari wrote: > when I "cvs update" and give complete (absolute) path, I get an error. [...] > If am NOT rsh ing, CVS accepts complete path. But with rsh, CVS has an > issue? > Did anybody see this? Any suggestions? Don't specify an absolute path ;=) -- 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://lists.gnu.org/mailman/listinfo/info-cvs
cvs update from a remote machine with a full path
Hi My CVSROOT is set to rsh a remote machine as below: CVSROOT bud12.cs.edu:/usr/users/abc/bin when I "cvs update" and give complete (absolute) path, I get an error. cvs update /bin/machines/scripts/abc.tcl When executing the above command I was in directory "machines" If I were to give the path from current directory, it works OK. Follwoing command has no issues. cvs update ./scripts If am NOT rsh ing, CVS accepts complete path. But with rsh, CVS has an issue? Did anybody see this? Any suggestions? Thanks Ashwin ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: FW: CVS update issue using -j to merge files between a branch and
Hamid Ghassemi writes: > > I know *why* this happens, but I don't agree with it. There was no diff > between the branch and the branch point on the trunk, so no change was > considered for the merge. At least that's how I understand it based on > how it behaves. Exactly. Merge works by considering exactly three revisions: in this case, the revision you're merging, the revision you're merging it into, and the common ancestor of the two. It does *not* consider any other revisions, or how you got from the common ancestor to either of the two merge revisions. This works just fine 99% of the time. It appears that you think you've run across the remaining 1%, but it's your own fault. By making the same change on both the trunk and the branch, you subverted CVS's ability to track what was going on. The right thing to do would have been to make the change one place or the other, merge the change to the other place, and remember the merge point. When you then did a later merge (from that merge point rather than from the common ancestor), you would get the conflict you expect. -Larry Jones I won't eat any cereal that doesn't turn the milk purple. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
FW: CVS update issue using -j to merge files between a branch and the trunk
This was sent by a co-worker of mine on May 6th. However for some reason it did not get to the mailing list. So I am sending this again. Hamid Ghassemi -Original Message- From: Joe Reifel ([EMAIL PROTECTED]) Sent: Thursday, May 06, 2004 12:21 PM To: '[EMAIL PROTECTED]' Subject: CVS update issue using -j to merge files between a branch and the trunk I did a search for this, but was unable to find it so I'm reporting it as new. Thank you in advance for reading this long email. Here's the easiest way to reproduce this is. Start with a file 3 lines long: the quick brown Add it to the trunk. Then branch. cvs tag -b MERGE Now do a double check-in of a change into both branches. In the trunk, change the third line to be in all caps (BROWN), and check it in. Do the same with the branch. Now the branch and the trunk contain the same file contents: the quick BROWN Then in the branch, change the third line back to small case (brown). Now the branch contains the following (mimics the original file at the branch point): the quick brown Of course in the real world, many changes may have happened to the file on the branch along the way, this is just the simplest way to show it. So here's what we have so far: Point of merge: the quick brown On the branch: the quick brown On the trunk: the quick BROWN Now do a "cvs diff ". It'll show line 3 as being different. Now do a "cvs update -j MERGE ". The update process happens, and it will return without error. It'll also return without merging anything. The resulting file will be the following: the quick BROWN <still in caps, the change from the branch didn't come down I know *why* this happens, but I don't agree with it. There was no diff between the branch and the branch point on the trunk, so no change was considered for the merge. At least that's how I understand it based on how it behaves. Cvs did actually do a good job of telling us that it was merging with the branch point; however, without a clear understanding of what impacts that might have created, along with performing a merge of 100's of files at once, this one tidbit got missed -- in fact, it took a lot of time looking at it to even make sense of what it was telling us. Other processes caught that this happened shortly after the merge so it was no big deal, but I can't help but wonder if this can be avoided in the future. It created a lot of paranoia about the merging process. I would have expected it to compare the branch with what there was in the trunk, then clearly it would have seen a diff. Then, if it would have noticed that line 3 was *also* changed on the trunk, it would have thrown a merge conflict, then the developer would have had a say in what version he/she really wanted. This is where I think the bug is. That all said, we are running CVS v1.10 here, perhaps this was fixed in a later revision, but I couldn't find mention of this on the website, so I don't know if it's fixed, I was hoping you could comment. Thanks! -Joe- ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
log when a user does a 'cvs update'
Is there a way to log when a user does a 'cvs update'? thanks, scott ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Need help on cvs update -I (Cap i ) is not working?
Thank you. You help to put the miserable out off my head today. Now I do understand how -I really works. One of my developer just show me with the hold bunches .exe ( from DOS )files and it seem to work fine. You guys are so cool. Thanks, C- Courier writes: > > Now my question does cvs -I still working on this 1.12.6 version? Yes, but it doesn't work the way you think. Files that are under CVS control or that are explicitly named on the command line are *never* ignored. The ignore list only affects files that are not currently under CVS control and that are implied (by being in a directory that's being processed). Such files are usually noted with a "?" status -- when included in the ignore list they are silent ignored instead. -Larry Jones ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Need help on cvs update -I (Cap i ) is not working?
Courier writes: > > Now my question does cvs -I still working on this 1.12.6 version? Yes, but it doesn't work the way you think. Files that are under CVS control or that are explicitly named on the command line are *never* ignored. The ignore list only affects files that are not currently under CVS control and that are implied (by being in a directory that's being processed). Such files are usually noted with a "?" status -- when included in the ignore list they are silent ignored instead. -Larry Jones Some people just don't have inquisitive minds. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Need help on cvs update -I (Cap i ) is not working?
Hello cvs suers, First, all my cvs client and server are run on Linux and cvs version is 1.12.6. Now my question does cvs -I still working on this 1.12.6 version? Here is what I am trying to do (not realy me, but one of my users) He is doing: cvs update -I file_name under his current working dir. The file_name is the old file and in the repository has the newer than the one he has. But cvs still updating to the latest file. Here is my duplicate what my user is trying to do: " cvs status mkcscope.sh File: mkcscope.sh Status: Needs Patch Working revision:1.7 Repository revision: 1.8 /cvs/cvsroot/PATH/mkcscope.sh,v Sticky Tag: (none) Sticky Date: (none) Sticky Options: (none) Now I do cvs update -I ----- cvs update -I mkcscope.sh ---> here is what I got: cvs update: Updating . P dir_list.txt P makefile P mkcscope.sh P mktags.sh cvs update: Updating 3rdParty cvs update: Updating 3rdParty/TimesTen --- Then : cvs status mkcscope.sh File: mkcscope.sh Status: Up-to-date Working revision:1.8 Repository revision: 1.8 /cvs/cvsroot/PATH/mkcscope.sh,v Sticky Tag: (none) Sticky Date: (none) Sticky Options: (none) - As you see now I got Working revision:1.8 . I don't want that file to be updated. So can anyone help? or do I have to deal with it. I know we can work around this issue, but I just want to know does -I still work? Thank you, C- ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
cvs update "out of memory" error
I am checking a directory via pserver remotely and it ran into an error on my linux host which has smaller amount of memory resource: cvs [server aborted]: out of memory; can not reallocate 50331648 bytes that directory contains severals tar files such as 75141120 Mar 9 16:53 ew53dataM.tar I tried to use CVSIGNORE to ignore all *.tar file but it seems it only does that if I am checking in a file. My question is how I can bypass that directory as a whole or set up some options to allocate more memory for CVS. Thanks ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: CVS Update problem : cannot rename file .new..buildnum to .buildn um
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Viraj Purang wrote: >Everytime I try to "cvs update" a file called ".buildnum" > >I get an error : >"cannot rename file .new..buildnum to .buildnum" > >This is true for all files which have been changed on client workspace >and are thus different from the server. > >What could be the possible problem ? > >Another interesting issue is that this problem occurs only when I am using a >Perl script to >do that CVS update.Manual updated are all ok. I would have to sauspect a problem with your perl script. CVS does not use any file naming pattern similar to `.new.*'. Derek - -- *8^) Email: [EMAIL PROTECTED] Get CVS support at <http://ximbiot.com>! -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.1 (GNU/Linux) Comment: Using GnuPG with Netscape - http://enigmail.mozdev.org iD8DBQFANREELD1OTBfyMaQRAlWpAKCc1I1HKN1zp5c4sU1rqbx89z6TPgCgyxrp 1uBP1nHYuQufxwMzOW0yr3o= =Bw7+ -END PGP SIGNATURE- ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: CVS Update problem : cannot rename file .new..buildnum to .buildn um
Hi! Have you got the said file or any other file refering to it open in a text editor or an IDE? I have faced this problem when I had the VC++ IDE open with the project file (but not the actual files) and was trying to update the project files (although the DSP and DSW workspace and project files were not updated). If this is the problem, then close the IDE or Text editor completely and try again. Hope this helps. Gagneet >-Original Message- >From: [EMAIL PROTECTED] >[mailto:[EMAIL PROTECTED] On Behalf >Of Viraj Purang >Sent: Thursday, 19 February, 2004 10:01 AM >To: '[EMAIL PROTECTED]' >Subject: CVS Update problem : cannot rename file >.new..buildnum to .buildn um > > >I am using a Windows 2003 server (problem also occurs on a >Windows 2000 professional laptop). > >Everytime I try to "cvs update" a file called ".buildnum" > >I get an error : >"cannot rename file .new..buildnum to .buildnum" > >This is true for all files which have been changed on client workspace >and are thus different from the server. > >What could be the possible problem ? > >Another interesting issue is that this problem occurs only >when I am using a Perl script to >do that CVS update.Manual updated are all ok. > >I did make sure that environment in both the >cases is same. > >Viraj B. Purang >Arzoon Inc. > > > >___ >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
CVS Update problem : cannot rename file .new..buildnum to .buildn um
I am using a Windows 2003 server (problem also occurs on a Windows 2000 professional laptop). Everytime I try to "cvs update" a file called ".buildnum" I get an error : "cannot rename file .new..buildnum to .buildnum" This is true for all files which have been changed on client workspace and are thus different from the server. What could be the possible problem ? Another interesting issue is that this problem occurs only when I am using a Perl script to do that CVS update.Manual updated are all ok. I did make sure that environment in both the cases is same. Viraj B. Purang Arzoon Inc. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: CVS update -j problem with merging directories.
Thanks for the suggestion. It worked for me. Very prompt response. Regards, Viraj Purang -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Sent: Thursday, February 05, 2004 2:13 PM To: [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] Subject: Re: CVS update -j problem with merging directories. Viraj Purang writes: > > The merge seems to be okay for most of the files, > except the 2 new directories > which were added to main and "r56b0" > between "build15" and "build20" tags. You need to use update -d to get new directories. -Larry Jones Nobody knows how to pamper like a Mom. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: CVS update -j problem with merging directories.
Viraj Purang writes: > > The merge seems to be okay for most of the files, > except the 2 new directories > which were added to main and "r56b0" > between "build15" and "build20" tags. You need to use update -d to get new directories. -Larry Jones Nobody knows how to pamper like a Mom. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
CVS update -j problem with merging directories.
I have 2 branches "r56b0" and "r56b0_branch_demo" other than the "main". "r56b0_branch_demo" was branched off from "r56b0" at tag id : "build15". "r56b0" is now at a tag level "build20". I merged changes made between "build15" to "build20" on "r56b0" into "r56b0_branch_demo" using "cvs update -j r56b0 " inside the working directory for "r56b0_branch_demo". The merge seems to be okay for most of the files, except the 2 new directories which were added to main and "r56b0" between "build15" and "build20" tags. How should I merge these 2 directories also ? or just simply add them on the "r56b0_branch_demo" branch ? Why is this happening ? Viraj B. Purang ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: weird cvs update error
I found the problem. I had created a symlink to a directory not in the repository awhile back. Removed that and no error message :-) --- "Paul Gelderblom (ptok)" <[EMAIL PROTECTED]> wrote: > > > I checked it out in my own directory as > 'ettinger'. > > > > CVS/Root has /usr/local/shared/cvs in it. The > > subdirectory kp2 is owned by mark, but this is the > > repository, as far as i know. > > > Oh, you are working in local mode (in contrast with > client/server) . > It's kind of odd that it asks you to login then. Are > you sure > kp2/CVS/Root also contains a local root (i.e. no > :xxx:[EMAIL PROTECTED]/repository)? > > I remember I always had permission problems with > local mode and multiple > users. It can be done though: see chapter 2.2.2 of > the Cederqvuist. > http://www.cvshome.org/docs/manual/cvs-1.11.7/cvs_2.html#SEC13 > > My preference is client/server, with the whole > repository > (maybe apart from CVSROOT) is owned by one unix > user. > Then the permission problems are gone as long as > everyone > just touches his or her own sandbox. > > Paul Gelderblom. > = Anthony Ettinger [EMAIL PROTECTED] http://www.apwebdesign.com Instant Messengers: 1) yahoo im: apwebdesign 2) aol im: apwebdesignxl 3) msn im: [EMAIL PROTECTED] 4) icq im: 659139 __ Do you Yahoo!? Yahoo! SiteBuilder - Free web site building tool. Try it! http://webhosting.yahoo.com/ps/sb/ ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: weird cvs update error
> I checked it out in my own directory as 'ettinger'. > > CVS/Root has /usr/local/shared/cvs in it. The > subdirectory kp2 is owned by mark, but this is the > repository, as far as i know. > Oh, you are working in local mode (in contrast with client/server) . It's kind of odd that it asks you to login then. Are you sure kp2/CVS/Root also contains a local root (i.e. no :xxx:[EMAIL PROTECTED]/repository)? I remember I always had permission problems with local mode and multiple users. It can be done though: see chapter 2.2.2 of the Cederqvuist. http://www.cvshome.org/docs/manual/cvs-1.11.7/cvs_2.html#SEC13 My preference is client/server, with the whole repository (maybe apart from CVSROOT) is owned by one unix user. Then the permission problems are gone as long as everyone just touches his or her own sandbox. Paul Gelderblom. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: weird cvs update error
Anthony Ettinger writes: > > cvs update: Updating special-reports > cvs update: Updating special-reports/img > cvs update: Updating styles > cvs update: authorization failed: server f1 rejected > access to /server/cvs for user mark > cvs update: used empty password; try "cvs login" with > a real password CVS remembers the CVSROOT that was used to do the initial checkout of each working directory (in CVS/Root) and uses it for all subsequent operations in that directory. It appears that mark did the original checkout of that (sub)directory, so CVS has remembered his CVSROOT (which contains his username) and is using it when you run update, but you haven't ever done as ``cvs login'' as him to store his password in your ~/.cvspass file. What you probably want to do is to change CVS/Root in that directory to your CVSROOT. -Larry Jones TIME?! I just finished the first problem! -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: weird cvs update error
You are probably working in a directory which was checked out by mark. CVS remembers the user who has checked out a sandbox in the CVS/Root file in the sandbox. - Original Message - From: "Anthony Ettinger" <[EMAIL PROTECTED]> To: <[EMAIL PROTECTED]> Sent: Thursday, January 22, 2004 20:40 Subject: weird cvs update error > When I run 'cvs update' in my checked out files, I get > the following error message: > > ... > cvs update: Updating special-reports > cvs update: Updating special-reports/img > cvs update: Updating styles > cvs update: authorization failed: server f1 rejected > access to /server/cvs for user mark > cvs update: used empty password; try "cvs login" with > a real password > > I have already used cvs login successfully with my > account, and I am not 'mark', 'mark' is another user > on the machine. > > Any ideas how to fix this? > > = > Anthony Ettinger > [EMAIL PROTECTED] > http://www.apwebdesign.com > Instant Messengers: > 1) yahoo im: apwebdesign 2) aol im: apwebdesignxl > 3) msn im: [EMAIL PROTECTED] 4) icq im: 659139 > > __ > Do you Yahoo!? > Yahoo! SiteBuilder - Free web site building tool. Try it! > http://webhosting.yahoo.com/ps/sb/ > > > ___ > 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: weird cvs update error
I checked it out in my own directory as 'ettinger'. CVS/Root has /usr/local/shared/cvs in it. The subdirectory kp2 is owned by mark, but this is the repository, as far as i know. Anthony --- "Paul Gelderblom (ptok)" <[EMAIL PROTECTED]> wrote: > You are probably working in a directory which was > checked out by mark. > CVS remembers the user who has checked out a sandbox > in the CVS/Root file in > the sandbox. > - Original Message - > From: "Anthony Ettinger" <[EMAIL PROTECTED]> > To: <[EMAIL PROTECTED]> > Sent: Thursday, January 22, 2004 20:40 > Subject: weird cvs update error > > > > When I run 'cvs update' in my checked out files, I > get > > the following error message: > > > > ... > > cvs update: Updating special-reports > > cvs update: Updating special-reports/img > > cvs update: Updating styles > > cvs update: authorization failed: server f1 > rejected > > access to /server/cvs for user mark > > cvs update: used empty password; try "cvs login" > with > > a real password > > > > I have already used cvs login successfully with my > > account, and I am not 'mark', 'mark' is another > user > > on the machine. > > > > Any ideas how to fix this? > > > > = > > Anthony Ettinger > > [EMAIL PROTECTED] > > http://www.apwebdesign.com > > Instant Messengers: > > 1) yahoo im: apwebdesign 2) aol im: > apwebdesignxl > > 3) msn im: [EMAIL PROTECTED] 4) icq im: > 659139 > > > > __ > > Do you Yahoo!? > > Yahoo! SiteBuilder - Free web site building tool. > Try it! > > http://webhosting.yahoo.com/ps/sb/ > > > > > > ___ > > Info-cvs mailing list > > [EMAIL PROTECTED] > > http://mail.gnu.org/mailman/listinfo/info-cvs > > > = Anthony Ettinger [EMAIL PROTECTED] http://www.apwebdesign.com Instant Messengers: 1) yahoo im: apwebdesign 2) aol im: apwebdesignxl 3) msn im: [EMAIL PROTECTED] 4) icq im: 659139 __ Do you Yahoo!? Yahoo! SiteBuilder - Free web site building tool. Try it! http://webhosting.yahoo.com/ps/sb/ ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
weird cvs update error
When I run 'cvs update' in my checked out files, I get the following error message: ... cvs update: Updating special-reports cvs update: Updating special-reports/img cvs update: Updating styles cvs update: authorization failed: server f1 rejected access to /server/cvs for user mark cvs update: used empty password; try "cvs login" with a real password I have already used cvs login successfully with my account, and I am not 'mark', 'mark' is another user on the machine. Any ideas how to fix this? = Anthony Ettinger [EMAIL PROTECTED] http://www.apwebdesign.com Instant Messengers: 1) yahoo im: apwebdesign 2) aol im: apwebdesignxl 3) msn im: [EMAIL PROTECTED] 4) icq im: 659139 __ Do you Yahoo!? Yahoo! SiteBuilder - Free web site building tool. Try it! http://webhosting.yahoo.com/ps/sb/ ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: how can I see what changes a cvs update would merge
"Robert P. J. Day" wrote:
>
> -Original Message-
> From: "Jim.Hyslop" <[EMAIL PROTECTED]>
> Sent: Nov 28, 2003 9:50 AM
> To: [EMAIL PROTECTED]
> Subject: RE: how can I see what changes a cvs update would merge
>
> Robert P. J. Day [mailto:[EMAIL PROTECTED] wrote:
> > ???. my cvs reference doesn't explain the "-wb" or "-i"
> > options to "cvs diff". care to elaborate?
> Have you tried "cvs --help diff"?
>
> -
> whoops, point taken. i was just glancing at the 2-page CVS reference card
> i got from www.refcards.com, and it made no mention of those diff options.
> i guess there really is more than one way to do things.
>
google on { "Quick Command Line Reference" cvs }
and you'll come up with a way to generate an `up to date` refcard for
your version of CVS.
if you want a pdf version I suggest you pipe its output through mpage
and ps2pdf :)
for the really impatient:
http://www.faqchest.com/prgm/cvs-l/cvs-99/cvs-9911/cvs-991102/cvs99110510_16799.html
or
http://www.geocrawler.com/archives/3/382/1999/4/50/2094674/
and the incredibly impatient:
http://www.enetis.net/~mitch/make-cvs-quickref
--
Todd Denniston
Crane Division, Naval Surface Warfare Center (NSWC Crane)
Harnessing the Power of Technology for the Warfighter
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
RE: how can I see what changes a cvs update would merge
Robert P. J. Day [mailto:[EMAIL PROTECTED] wrote: > -Original Message- > From: "Jim.Hyslop" <[EMAIL PROTECTED]> > Robert P. J. Day [mailto:[EMAIL PROTECTED] wrote: > > ???. my cvs reference doesn't explain the "-wb" or "-i" > > options to "cvs diff". care to elaborate? > Have you tried "cvs --help diff"? > > - > whoops, point taken. By the way, in all fairness I should point out that older CVS clients only document the options l, N and R, and refer you to the RCS documentation for all other options, so you could quite legitimately have answered "Yes, but it doesn't help" :-) -- 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
cvs [update aborted]: no such tag foo-6
Hi, I'm having a terrible time with merges (of course at release time). My first problem is below, the second one is in a separate email. When I run: cvs -q update -j foo-6 -j foo-branch I get this response: cvs [update aborted]: no such tag foo-6 I can verify the tag exists with lstag -l and by doing a checkout: cvs -d /opt/CVS co -r foo-6 runs successfully and a cvs status of any file shows a sticky tag of foo-6, verifying that the tag really exists. I've tried both adding and removing "foo-6 y" from val-tags. The repository in question is running on RedHat 8.0 with CVS 1.11.2. The same behavior exists using 1.11.9. (I copied the repository to another machine and upgraded cvs there) Thank you in advance! -- Wayne Walker [EMAIL PROTECTED] Do you use Linux?! http://www.bybent.com Get Counted! http://counter.li.org/ Jabber IM: [EMAIL PROTECTED] AIM: lwwalkerbybent ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: how can I see what changes a cvs update would merge
-Original Message- From: "Jim.Hyslop" <[EMAIL PROTECTED]> Sent: Nov 28, 2003 9:50 AM To: [EMAIL PROTECTED] Subject: RE: how can I see what changes a cvs update would merge Robert P. J. Day [mailto:[EMAIL PROTECTED] wrote: > ???. my cvs reference doesn't explain the "-wb" or "-i" > options to "cvs diff". care to elaborate? Have you tried "cvs --help diff"? - whoops, point taken. i was just glancing at the 2-page CVS reference card i got from www.refcards.com, and it made no mention of those diff options. i guess there really is more than one way to do things. rday ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: how can I see what changes a cvs update would merge
Robert P. J. Day [mailto:[EMAIL PROTECTED] wrote: > ???. my cvs reference doesn't explain the "-wb" or "-i" > options to "cvs diff". care to elaborate? Have you tried "cvs --help diff"? -- 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
RE: how can I see what changes a cvs update would merge
-Original Message- From: Gagneet Singh <[EMAIL PROTECTED]> Sent: Nov 28, 2003 9:35 AM To: "'Robert P. J. Day'" <[EMAIL PROTECTED]>, 'Urs Thuermann' <[EMAIL PROTECTED]> Cc: [EMAIL PROTECTED] Subject: RE: how can I see what changes a cvs update would merge cvs diff -wb -i File1.dsp And find out what has changed. -- ???. my cvs reference doesn't explain the "-wb" or "-i" options to "cvs diff". care to elaborate? rday ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: how can I see what changes a cvs update would merge
Gagneet Singh [mailto:[EMAIL PROTECTED] wrote:
> Further to my previous mail, for the cvs command line you can use the
> following command to get the status of the files which have changed.
>
> cvs -n update -P
>
> M File1.dsp
>
> The above tells you that the file name 'File1.dsp' has been locally
> modified. Now you can diff it with the previous version on the server
> by:
>
> cvs diff -wb -i File1.dsp
>
> And find out what has changed.
Not quite - this will tell you what *you* have changed. It will not tell you
what the results of the merge will be, which was the original question.
By the way, on the original question: I usually find it is more trouble than
it's worth to find out what the results would be. I usually just go ahead
with the merge. This approach works best when all developers commit their
changes fairly frequently, and refresh their code frequently as well
("frequently" meaning no more than a day or two between check-ins). Some
people worry about "breaking the build" - i.e. checking in code that won't
compile. Well, if you're doing so much that your code is completely
un-compileable for two days, then you are likely trying to do too much at
once. You need to break down your task into smaller chunks, which can be
checked in as you go.
--
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
RE: how can I see what changes a cvs update would merge
Urs Thuermann [mailto:[EMAIL PROTECTED] wrote: > How can I see the changes that a call to cvs update would do to the > working copy of my files, without actually applying the changes? cvs di -rHEAD Note that this will work whether you are working on a branch or on the trunk - diff (and *only* diff) interprets HEAD to mean the head revision of whatever branch or trunk you are working on (all other commands interpret HEAD to mean 'the head revision on the trunk'). -- 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
RE: how can I see what changes a cvs update would merge
Robert P. J. Day [mailto:[EMAIL PROTECTED] wrote: > this resembles something i (as a newbie) have been thinking > about recently > -- what are all the ways i can just *query* with regards to a CVS > repository? it's this querying that seems to get such short > shrift in the > CVS documentation i've seen. [...] > so all the different ways to query an existing repository > would be a good > start. Hmm... I've been doing it for so long, I don't even think about the different ways to do it. How about we start this way - you ask specific questions about what you want to know, and keep track of the answers you get. Once you've built up a few, submit a patch for the documentation. One I find very useful, and which I _think_ is documented, is: cvs -nq up This gives you a list of files that need to be checked in, updated, and "unknown" files - the ones that you may have forgotten to check in. -- 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
RE: how can I see what changes a cvs update would merge
Hi! Further to my previous mail, for the cvs command line you can use the following command to get the status of the files which have changed. cvs -n update -P M File1.dsp The above tells you that the file name 'File1.dsp' has been locally modified. Now you can diff it with the previous version on the server by: cvs diff -wb -i File1.dsp And find out what has changed. Hope this helps. Gagneet |-Original Message- |From: [EMAIL PROTECTED] |[mailto:[EMAIL PROTECTED] On Behalf |Of Robert P. J. Day |Sent: Friday, 28 November, 2003 16:09 PM |To: Urs Thuermann |Cc: [EMAIL PROTECTED] |Subject: Re: how can I see what changes a cvs update would merge | | |On 28 Nov 2003, Urs Thuermann wrote: | |> How can I see the changes that a call to cvs update would do to the |> working copy of my files, without actually applying the changes? | |this resembles something i (as a newbie) have been thinking |about recently |-- what are all the ways i can just *query* with regards to a |CVS repository? it's this querying that seems to get such |short shrift in the CVS documentation i've seen. | |certainly, there's variations like: | | $ cvs log ... | $ dvs diff ... | $ cvs co -c | |and so on. i think it would be immensely useful for beginners |like me to have a reference list/cheat sheet of all of these |kinds of options since, in a big way, beginners have a real |fear of committing or updating when they don't know what's |about to happen. | |so all the different ways to query an existing repository |would be a good |start. | |rday | | | | |___ |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: how can I see what changes a cvs update would merge
On 28 Nov 2003, Urs Thuermann wrote: > How can I see the changes that a call to cvs update would do to the > working copy of my files, without actually applying the changes? this resembles something i (as a newbie) have been thinking about recently -- what are all the ways i can just *query* with regards to a CVS repository? it's this querying that seems to get such short shrift in the CVS documentation i've seen. certainly, there's variations like: $ cvs log ... $ dvs diff ... $ cvs co -c and so on. i think it would be immensely useful for beginners like me to have a reference list/cheat sheet of all of these kinds of options since, in a big way, beginners have a real fear of committing or updating when they don't know what's about to happen. so all the different ways to query an existing repository would be a good start. rday ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: how can I see what changes a cvs update would merge
Hi! For your first question search the archives for the BrowseRepoTk script made by Oliver Giesen. This will work with the WinCVS client. You could modify it to be used on a command line with only TCL... :-) A quote from his mail in this respect, "There is no newer version of the WinCvs product package available (unless you count 1.3.13.2 - the *only* difference to 1.3.13.1 is support for Python 2.3.x and the version of the bundled CVSNT client though). The feature you are quoting is a macro I wrote. If you want you could pull it directly from the CVSGUI repository via CVS or use the ViewCvs link given in http://people.freenet.de/ogiesen/readme.html#BrowseRepoTk . Note however that if your server is CVSNT there already is a much more powerful interface available right now. Just click the elipsis button next to any edit box requiring you to enter a module name. However, *if* all goes well, WinCvs 1.3.14 will be released within the next two weeks at latest (including that macro). Be aware however that A LOT has changed since 1.3.13 and it is anticipated that a short succession of bugfix releases will follow so if you want to play safe, you should as always wait until a new release is advertised on the WinCvs homepage. Let me add however that I'm using a self-compiled version of WinCvs for several months already and it hasn't ever crashed or done bad things on me during that time at all. YMMV." For your second question, Currently if you are using the WinCVS client, then click on the checked out module folder and pres F4. Others will be able to guide you better for command line processes. Gagneet |-Original Message- |From: [EMAIL PROTECTED] |[mailto:[EMAIL PROTECTED] On Behalf |Of Urs Thuermann |Sent: Friday, 28 November, 2003 15:18 PM |To: [EMAIL PROTECTED] |Subject: how can I see what changes a cvs update would merge | | |How can I see the changes that a call to cvs update would do |to the working copy of my files, without actually applying the changes? | |urs | | |___ |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
how can I see what changes a cvs update would merge
How can I see the changes that a call to cvs update would do to the working copy of my files, without actually applying the changes? urs ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: cvs update times
Eric Siegerman writes: > > Didn't someone say that "co" locks the whole tree, but "update" > only locks one directory at a time? If they did, they're wrong. Checkout and update both use the same underlying code, so they both do locking the same way (directory at a time). I think admin, commit and the various edit and watch commands are the only things that lock the whole tree; everything else locks a directory at a time. -Larry Jones Please tell me I'm adopted. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: cvs update times
On Fri, Nov 14, 2003 at 01:55:55PM -0800, Richard Pfeiffer wrote: > The project in question (Proj A) and one > I'm using for comparison look like this: > > Proj A is half the size as Proj B, but did have more directories. I might have to > find out just how many more. > Proj A took 2m15s to checkout, Proj B took 10m30s. > Proj A took 1m14s to update, Proj B to 1m20s. How long do the "du -k" commands take? (Make sure the data is *not* in the buffer cache.) The time for a "du" is proportional to total number of filesystem objects, not to directories specifically, but the numbers might still be interesting. > So Proj B is twice the Kb, takes 5 times longer to checkout but updates in the same > time as Proj A. I'd be interested to know counts of files and directories for both projects. Not sure what use all these numbers would be, but they couldn't hurt :-) > I would just write it off to # of dirs, but users claim it was > much faster last week. I'll have to check and see if they > checked in a bunch of files all in seperate directories, etc. Hmm, it just occurs to me. How about changes on the client side? Could it be that the project-A people (but not the project-B people) installed some app on their Windows boxes that interacts badly with WinCVS? Or in the network? Is there a flaky hub in the project-A room, or is someone there downloading DVDs in the background and saturating their uplink? :-) > Could indivdual file or directory sizes have any bearing? Sure, they could be confusing the issue. If project B has N large files, and project A has N small files, I'd expect to see something very roughly like you're seeing -- though the "twice the KB, 5 times longer to check out" part is mystifying. But that aside, I'd expect the update times to be similar (assuming, of course, that the sandboxes were already up to date). Unlike actually fetching updates, merely checking up-to-dateness isn't proportional to the file sizes. > Does a checkout's locking structure differ from an update's > locking structure? I wouldn't think so, but if that was true, > I would think the co and update times would be proportional for > these two projects. Didn't someone say that "co" locks the whole tree, but "update" only locks one directory at a time? I don't see how that would affect things, though. -- | | /\ |-_|/ > Eric Siegerman, Toronto, Ont.[EMAIL PROTECTED] | | / It must be said that they would have sounded better if the singer wouldn't throw his fellow band members to the ground and toss the drum kit around during songs. - Patrick Lenneau ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: cvs update times
Thanks Eric. I had actually thought of both of those and took quick looks: 1) There are no branches as of yet, so that nixed that thought! 2) I think the second thought is the one I need to investigate further. Just wanted to see if the list concurred, or had ideas I overlooked. I initially took a quick look at the directory structure while doing a du -k to see how large the project was getting. The project in question (Proj A) and one I'm using for comparison look like this: Proj A is half the size as Proj B, but did have more directories. I might have to find out just how many more. Proj A took 2m15s to checkout, Proj B took 10m30s. Proj A took 1m14s to update, Proj B to 1m20s. So Proj B is twice the Kb, takes 5 times longer to checkout but updates in the same time as Proj A. I would just write it off to # of dirs, but users claim it was much faster last week. I'll have to check and see if they checked in a bunch of files all in seperate directories, etc. Could indivdual file or directory sizes have any bearing? Does a checkout's locking structure differ from an update's locking structure? I wouldn't think so, but if that was true, I would think the co and update times would be proportional for these two projects. Thx, -R Eric Siegerman <[EMAIL PROTECTED]> wrote: On Fri, Nov 14, 2003 at 12:27:01PM -0800, Richard Pfeiffer wrote:> However, we have one project in this repository that now takes> 1:58 to checkout and 1:29 to update. It used to update much> faster; these 'slow' update times just started occuring.Two stabs in the dark:- Are you on a branch, with large files and/or many revisionsbetween head of branch and head of trunk? Many operations inCVS take longer under such circumstances, because of the wayrevisions are stored in the ,v file (trunk as reverse deltasfrom the head; branches as forward deltas from the branchpoint. See rcsfile(5)).- Does your slow project have a much larger directory:fileratio than your other projects? If so, it could be thatlocking overhead is dominating the total update time in thatproject, whereas in your other projects it's the useful workof updating revisions that dominates. CVS's locking overheadis proportional to the number of directories (not files)being operated on.--| | /\|-_|/ > Eric Siegerman, Toronto, Ont. [EMAIL PROTECTED]| | /It must be said that they would have sounded better if the singerwouldn't throw his fellow band members to the ground and toss thedrum kit around during songs.- Patrick Lenneau___Info-cvs mailing list[EMAIL PROTECTED]http://mail.gnu.org/mailman/listinfo/info-cvs Do you Yahoo!? Protect your identity with Yahoo! Mail AddressGuard___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: cvs update times
On Fri, Nov 14, 2003 at 12:27:01PM -0800, Richard Pfeiffer wrote: > However, we have one project in this repository that now takes > 1:58 to checkout and 1:29 to update. It used to update much > faster; these 'slow' update times just started occuring. Two stabs in the dark: - Are you on a branch, with large files and/or many revisions between head of branch and head of trunk? Many operations in CVS take longer under such circumstances, because of the way revisions are stored in the ,v file (trunk as reverse deltas from the head; branches as forward deltas from the branch point. See rcsfile(5)). - Does your slow project have a much larger directory:file ratio than your other projects? If so, it could be that locking overhead is dominating the total update time in that project, whereas in your other projects it's the useful work of updating revisions that dominates. CVS's locking overhead is proportional to the number of directories (not files) being operated on. -- | | /\ |-_|/ > Eric Siegerman, Toronto, Ont.[EMAIL PROTECTED] | | / It must be said that they would have sounded better if the singer wouldn't throw his fellow band members to the ground and toss the drum kit around during songs. - Patrick Lenneau ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
cvs update times
Good Afternoon, Using 1.11 and WinCVS 1.2 and/or Eclipse against a Solaris 4x4 Quick question: Normally, with all the other projects in our repository, a project that takes 8 minutes to checkout can have an update immediately run on it that takes 59 seconds or so. Everything runs pretty relative to those times for all the other projects (a project that take 4 minutes to checkout can be updated in 30 seconds, etc) However, we have one project in this repository that now takes 1:58 to checkout and 1:29 to update. It used to update much faster; these 'slow' update times just started occuring. Wondering if there are certain files type(s) that may have been checked in that are causing the slow down? Something that should have or could have been checked in as binary but wasn't, etc. Or, is it be something else? Thanks in advance for any suggestions. -R Do you Yahoo!? Protect your identity with Yahoo! Mail AddressGuard___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
behavior change for 'cvs update -jrev1 -jrev2' soon to occur
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
If you attempt to issue a
cvs update -j xxx -j yyy
where yyy is the base version of a file in your
directory, cvs currently ignores the command, because
it assumes that the change must already be in your
local version, and there's no reason for you to have
gone to the effort of deleting the code only to request
it be readded.
There are some people who effectively do wish to delete
code and then request it to be re-applied (it takes all sorts).
Does anyone object to CVS actioning the "re-apply" request?
As an example,
commit a file with the lines
aaa
bbb
ccc
add "ddd" to the end.
then commit that.
then delete ddd from the file.
then do a cvs update -j 1.1 -j 1.2 to put the ddd back in.
The current versions (1.11.9 and 1.12.1) of CVS will
ignore you.
Another example:
commit a file with the lines
aaa
bbb
ccc
ddd
remove the "ddd" line.
then commit that.
then add "ddd" to the end of the file.
then do a cvs update -j 1.1 -j 1.2 to remove it again.
The current versions (1.11.9 and 1.12.1) of CVS will
ignore you.
A final example:
commit a file with the lines
aaa
bbb
ccc
add a "ddd" line.
then commit that.
then change "ddd" to "".
then do a cvs update -j 1.1 -j 1.2 to cause
conflict markers to appear along with both the
"ddd" line and the "" line so that you can more
carefully consider how to accomodate the original
version and your new change.
The current versions (1.11.9 and 1.12.1) of CVS will
ignore you.
A change that will be committed shortly will tell CVS
to not ignore your request and instead will let diff3
figure out what needs to happen.
It is believed that this new behaviour, acknowledging
the "re-apply" request, is consistent with both the
documentation, logic, and the behaviour of diff3.
If you rely on the old behaviour, please elaborate on the
circumstances where you issue the join command expecting
it to do nothing.
Thanks go to Paul Edwards for reporting the problem and
for most of the description above (expanded and changed
by me, so any errors in clarity are likely my fault).
A full thread of this discussion is available on the
[EMAIL PROTECTED] mailing list archived at mail.gnu.org
the first message in the thread begins with the URL:
http://mail.gnu.org/archive/html/bug-cvs/2003-10/msg00199.html
Thank you,
-- Mark
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.2.3 (FreeBSD)
iD8DBQE/lshe3x41pRYZE/gRAnznAKDEFAFu+YRQAW6xVH8ZbHoPjEoRFgCgshbX
/EP59ufuva1qrELqd3rc15Y=
=Y2eS
-END PGP SIGNATURE-
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
Re: CVS update + access via ssh.
Mensaje citado de [EMAIL PROTECTED] el 10/09/2003 10:00: When I ran ssh -v I noticed that the generated key was not accepted by the remote server. Any ideas? The directory .ssh must be chmoded 700 (only owner can cd into it), while the file authorized_keys inside can be chmoded whatever you like. This, on the remote side. On the local side, check that permissions for the private key file are proper. In my case, id_rsa is chmoded 600. Maybe, also, one of the users has listed a valid shell at /etc/passwd, while the other has not. Good luck. Regards, Ismael -- Ismael Valladolid Torres, Technical Support Oberthur Card Systems, Bajo Oficina C, Edificio Valrealty B 28023 La Florida - Madrid (Spain) - http://www.oberthurcs.com/ Tel. +34 917 355 461 - Fax: +34 917 355 453 ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
CVS update + access via ssh.
Hello, I have got two problems: cvs update/checkout I have existing structure of directories which I have to preserve. I ran cvs checkout but it did nothing. How to do checkout/update into existing directory (without CVS control directories)? (Of course I can checkout into new directory and then copy the checked-out files, but it is not very convenient) access via ssh I have generated and populated the keys for two users exactly the same way. But one user can connect without passing a password, while the other one has to give a password. When I ran ssh -v I noticed that the generated key was not accepted by the remote server. Any ideas? Jacek ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Is there a way before CVS EDIT to call CVS UPDATE?
Is there a way before CVS EDIT to call CVS UPDATE ? Roman R ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: FW: cvs update
Sachin Mathur <[EMAIL PROTECTED]> writes: > Hi I am new to cvs , > when I do a cvs update I get this > > > > what does all the alphabets mean like M , P , U etc See http://www.cvshome.org/docs/manual/cvs-1.11.6/cvs_16.html#SEC154 -- Mark ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
FW: cvs update
Hi I am new to cvs , when I do a cvs update I get this what does all the alphabets mean like M , P , U etc ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: cvs update info
You don't say what operating system you are using, but whatever it is you should be able to redirect the output to a file, for example by doing: cvs update > info.txt Then you can browse the file with whatever text editor or viewer you like. If you are using a Unix-alike you could use 'more info.txt' to paginate the output, or on a WinDoze DOS client, use 'morehttp://www.microlise.co.uk mailto:[EMAIL PROTECTED] ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: cvs update info
Try using the attached perl script. It cleans up the display quite nicely, with a summary at the end for things like conflicts, files in the way, etc. > I perform a cvs update on a large directory structure, and a conflict > happens, but the file it happened on is too far up to scroll to. Does > anyone know how to retrieve that information? In other words, how do I > find out which files were in conflict after I have performed an update? > > Rich > > > > ___ > Info-cvs mailing list > [EMAIL PROTECTED] > http://mail.gnu.org/mailman/listinfo/info-cvs cvs_update_display.pl Description: Binary data ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: cvs update info
Rich, cvs update >update.txt ? cvs update | less ? Steve On Thu, 2003-02-20 at 18:57, richard blair wrote: > I perform a cvs update on a large directory structure, and a conflict > happens, but the file it happened on is too far up to scroll to. Does > anyone know how to retrieve that information? In other words, how do I > find out which files were in conflict after I have performed an update? > > Rich -- Steven Tryon, CIBER @ Xerox Webmaster, Xerox Global Service Net 8*221-7719 / 585-231-7719 ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: cvs update info
richard blair <[EMAIL PROTECTED]> writes:
> I perform a cvs update on a large directory structure, and a conflict
> happens, but the file it happened on is too far up to scroll to. Does
> anyone know how to retrieve that information? In other words, how do I
> find out which files were in conflict after I have performed an update?
If you run 'cvs -n update' again, the files that are in conflict will be
listed. You may also run the 'cvs status' command to see files that are
in conflict ("File had conflicts on merge").
Enjoy!
-- Mark
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
cvs update info
I perform a cvs update on a large directory structure, and a conflict happens, but the file it happened on is too far up to scroll to. Does anyone know how to retrieve that information? In other words, how do I find out which files were in conflict after I have performed an update? Rich ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: cvs update lag
[EMAIL PROTECTED] writes: > We are seeing major lag when issuing "cvs update . " in the root dir. of any of our >dev's checkouts. > > (Major lag as in 5 mins. or MORE) > > A trace shows a long wait @ " -> unlink_file(CVS/Entries.Log)". > > Our CVS server is FreeBSD. The main clients are Solaris and Linux. > > Any clues/hints/pointers of where I should be looking for the lag? How big is the tree you are checking? Recall that the server builds up a copy of the impacted files in /tmp/cvs-serv and that at the end of the cvs update it will need to do the equivalent of a rm -fr /tmp/cvs-serv to remove any files that have collected on the server side of the connection. -- Mark ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
cvs update lag
We are seeing major lag when issuing "cvs update . " in the root dir. of any of our dev's checkouts. (Major lag as in 5 mins. or MORE) A trace shows a long wait @ " -> unlink_file(CVS/Entries.Log)". Our CVS server is FreeBSD. The main clients are Solaris and Linux. Any clues/hints/pointers of where I should be looking for the lag? -- __ __ \ \/ /Jeraimee Hughes \ /PHP Sith / \ Revelex Corporation /_/\_\ Phone: (561) 988-5588 http://engine.revelex.com/ ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: permission denied by rshd while doing CVS update
What happens when you run "rsh remoteHost echo hello world", where "remoteHost" is the name of the machine storing your repository? Chances are that your .rhosts file isn't configured properly for the client and server machines. Also make sure its mode is 600. --- Forwarded mail from [EMAIL PROTECTED] While doing cvs update I got an error I am working on windows platform. cvs update: cannot log in as local user 'pkoti', remote user 'pkoti' cvs [update aborted]: Permission denied by rshd Can anybody guess what could be the wrong. --- End of forwarded message from [EMAIL PROTECTED] ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
permission denied by rshd while doing CVS update
While doing cvs update I got an error I am working on windows platform. cvs update: cannot log in as local user 'pkoti', remote user 'pkoti' cvs [update aborted]: Permission denied by rshd Can anybody guess what could be the wrong. Thanks, -Koti ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: cvs update
[EMAIL PROTECTED] writes: > > The platform is windowsNT. It's a client server mode and I'm using > cvsnt_1.11.1.3. Is cvsnt the client as well as the server? (I don't know much about cvsnt -- it's a separate line of development from the standard CVS.) If so, perhaps you've found a bug, but I still think the most likely problem is that your working directory is on a network share of some kind that's not working right. As far as CVS is concerned, it sounds like you're not doing anything wrong. -Larry Jones I think we need to change the rules. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: cvs update
The platform is windowsNT. It's a client server mode and I'm using cvsnt_1.11.1.3. I have some jar files that need to be updated so on the server side I've added the .jar extension to the .cvswrapper file. And then I import the file using jcvs. But I think somehow the files got corrupted cos I cannot open them using win zip also on update. On update I'm not using any special switch or flag (cvs update moduleName). Is this the correct way to handle jar files in cvs. I'm really really new to cvs please help. I'll appreciate any help on how to handle jar file Gunjan -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]] Sent: Monday, October 07, 2002 4:23 PM To: [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] Subject: Re: cvs update [EMAIL PROTECTED] writes: > > MIME-Version: 1.0 > Content-Type: multipart/alternative; Please don't send MIME and/or HTML encrypted messages to the list. Plain text only, PLEASE! > Cvs[update aborted]: cannot rename file .new.delludf.jar to delludf.jar: > No such file or directory. > > Is this because of the .jar extension? No. Most likely, your "local" directory isn't really local and there are bugs in your network file system (or at least incompatibilities with CVS's expectations). Another possibility is that your CVS wasn't configured correctly for your platform. It would help to know what platform you're running on, whether you're running in local mode or client/server mode, and what version(s) of CVS you're using. -Larry Jones What better way to spend one's freedom than eating chocolate cereal and watching cartoons! -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: cvs update
[EMAIL PROTECTED] writes: > > MIME-Version: 1.0 > Content-Type: multipart/alternative; Please don't send MIME and/or HTML encrypted messages to the list. Plain text only, PLEASE! > Cvs[update aborted]: cannot rename file .new.delludf.jar to delludf.jar: > No such file or directory. > > Is this because of the .jar extension? No. Most likely, your "local" directory isn't really local and there are bugs in your network file system (or at least incompatibilities with CVS's expectations). Another possibility is that your CVS wasn't configured correctly for your platform. It would help to know what platform you're running on, whether you're running in local mode or client/server mode, and what version(s) of CVS you're using. -Larry Jones What better way to spend one's freedom than eating chocolate cereal and watching cartoons! -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
cvs update
I get the following error when I try to update my local directory Cvs[update aborted]: cannot rename file .new.delludf.jar to delludf.jar: No such file or directory. Is this because of the .jar extension? Gunjan
cvs update
I get the following error when I try to update my local directory Cvs[update aborted]: cannot rename file .new.delludf.jar to delludf.jar: No such file or directory. Is this because of the .jar extension? Gunjan
cvs update won't ignore certain files specified with -I
== Overview: == I am creating an Ant task that merges multiple vendor branches in CVS into the main branch. I am having a problem getting cvs to ignore a problem file during an update with no success. I recognize that strictly speaking this is really a cvs issue. cvs update -I somefile -r someTag -r someTag is not working. == Problem statement: = Assume there are two vendor branches (1.1.3 and 1.1.4) tagged VendorBranchA and VendorBranchB respectively. Imports into each branch are tagged with release tags VendorA_X and VendorB_X respectively. X is an integer counter incremented for each import for a specific vendor branch. i.e.: day1) prompt>cvs import -b 1.1.3 mainpackage VendorBranchA VendorA_1 prompt>cvs import -b 1.1.4 mainpackage VendorBranchB VendorB_1 day2) prompt>cvs import -b 1.1.3 mainpackage VendorBranchA VendorA_2 day3) prompt>cvs import -b 1.1.3 mainpackage VendorBranchA VendorA_3 prompt>cvs import -b 1.1.4 mainpackage VendorBranchB VendorB_2 Let there be a file mainpackage/coolstuff/test4.txt that exists on branch VendorBranchA at the VendorA_2 tag location, but is removed at the VendorA_3 tag location. Let the same file name mainpackage/coolstuff/test4.txt exist on branch VendorBranchB at the VendorB_1 and VendorB_2 tag locations. During an automated merge between day3 and day2 the following update commands are issued in the work directory where the "mainpackage" package has been checked out. X:\junk2>cvs update -j VendorA_2 -j VendorA_3 cvs update: Updating mainpackage cvs update: Updating mainpackage/coolstuff cvs update: scheduling mainpackage/coolstuff/test4.txt for removal X:\junk2>cvs update -j VendorB_1 -j VendorB_2 cvs update: Updating mainpackage cvs update: Updating mainpackage/coolstuff R mainpackage/coolstuff/test4.txt cvs [update aborted]: cannot open test4.txt for copying: No such file or directory Upon close inspection the reason for the failure becomes apparent. The troublesome file mainpackage/coolstuff/test4.txt is scheduled for removal by the first update command (this includes being erased from the working area). When the second update command tries to update the same file it is no longer available. >From a use case standpoint, this problem equates to developers responsible for VendorBranchA removing the file from their code base and the developers responsible for VendorBranchB still having the file around. == Question: == The second update command is aborted "[update aborted]". The file(s) responsible for the failure is easily parsed from the command's standard output and standard error. The desired behavior in this circumstance is to then reattempt the update ignoring the problematic file. I could implement more complex decision logic, but prefer to simply log the errant file and move forward (at least for now). In an attempt to ignore the troublesome file the following attempt to use the -I option is made: X:\junk2>cvs update -I mainpackage/coolstuff/test4.txt -j VendorB_1 -j VendorB_2 cvs update: Updating mainpackage cvs update: Updating mainpackage/coolstuff R mainpackage/coolstuff/test4.txt cvs [update aborted]: cannot open test4.txt for copying: No such file or directory As can be seen this is not effective at preventing the "[update abort]". I tried several variations on this theme to no avail. Either the cvs client being driven is buggy, or I do not understand how to properly use it. My intention is to simply detect the problem on the first pass and then skip over it on the second. Can anyone provide guidance as to how to get cvs to move forward without aborting? Inquiring Minds Want to Know: In case your wondering there is a corresponding ant import task I have written which follows the conventions expected by my ant merge task. James Lee Carpenter Software Engineer Household Technical Services 6602 Convoy Court San Diego, CA 92111 ph: 858-609-2461 email: [EMAIL PROTECTED] ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: cvs update
Jayashree writes: > > $cvs status a.c > File: a.cStatus: Locally Modified >Working revision:1.40Mon Sep 2 20:46:00 2002 >Repository revision: 1.40/home/cvs/a.c,v > > What does the time stamp " Mon Sep 2 20:46:00 2002" mean? > Is that the checkout/update time or checkin time of the file? Neither; or both, depending on how you look at it. It's the timestamp the file had the last time CVS checked that it was identical to revision 1.40. -Larry Jones Don't you hate it when your boogers freeze? -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: cvs update (cvs status shows CVS/Entries cached date/time)
Jayashree wrote: > > Hi, > > $cvs status a.c > File: a.cStatus: Locally Modified >Working revision:1.40Mon Sep 2 20:46:00 2002 >Repository revision: 1.40/home/cvs/a.c,v > > What does the time stamp " Mon Sep 2 20:46:00 2002" mean? > Is that the checkout/update time or checkin time of the file? > > Regards > Jayashree cvs status a.c ls -l a.c #note timezone to GMT effect sleep 60;touch a.c cvs status a.c ls -l a.c #note no change from above cp a.c a.c.bak sleep 60;cp a.c.bak a.c;date grep a\.c CVS/Entries cvs status a.c;date grep a\.c CVS/Entries cvs status a.c;date ls -l a.c #note timezone to GMT effect #A1: last time the local file was noted by cvs to have been written. #A2: last time the local file was written. #where written can be by cvs [checkout|update], save from your editor, cp. cvs version Concurrent Versions System (CVS) 1.11 (client/server) CVS Gurus Is this supposed to report the cached value, instead of the filesystem value which it caches during the command (kind of surprised me) Unfortunately http://www.cvshome.org/docs/manual/cvs_17.html#SEC155 and http://www.cvshome.org/docs/manual/cvs_10.html#SEC84 have the only detailed Cederqvist info I could find on cvs status and neither documents the time field for the Working revision. So do we have an annoyance level buglet? -- __ I'd crawl over an acre of 'Visual This++' and 'Integrated Development That' to get to gcc, Emacs, and gdb. Thank you. -- Vance Petree, Virginia Power ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: cvs update
hi, It will be the last committed timestamp according to me... -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]On Behalf Of Jayashree Sent: Friday, September 06, 2002 12:13 PM To: [EMAIL PROTECTED] Subject: cvs update Hi, $cvs status a.c File: a.cStatus: Locally Modified Working revision:1.40Mon Sep 2 20:46:00 2002 Repository revision: 1.40/home/cvs/a.c,v What does the time stamp " Mon Sep 2 20:46:00 2002" mean? Is that the checkout/update time or checkin time of the file? Regards Jayashree *** This message is proprietary to Future Software Limited (FSL) and is intended solely for the use of the individual to whom it is addressed. It may contain privileged or confidential information and should not be circulated or used for any purpose other than for what it is intended. If you have received this message in error, please notify the originator immediately. If you are not the intended recipient, you are notified that you are strictly prohibited from using, copying, altering, or disclosing the contents of this message. FSL accepts no responsibility for loss or damage arising from the use of the information transmitted by this email including damage from virus. *** ___ 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
