RE: how to extract two versions of file for comparison

2005-07-15 Thread Dave Korn
Original Message From: Dave Korn Sent: 14 July 2005 14:31 Original Message From: NoPlatitudes Sent: 14 July 2005 14:16 I am trying to get the difference between the latest working version of a file and a previous version. I need to use a third party tool to examine this

need help

2005-07-14 Thread harish deshmukh
Hi friends I am harish from India working as Jr.System Admin in a software development company. Actually i want to implement an version control software in my compnay. Could any one tell me from where i can download the cvs server client implement it becoz on the net it is having lots of ver on

Re: problem with the Tortoise ssh -pw password option

2005-07-14 Thread Russ Sherk
On 13 Jul 2005 19:00:09 -0700, Ed [EMAIL PROTECTED] wrote: I know this is an insecure method, but I'm going crazy typing in my password every 2 seconds, and the pageant, puttygen, option keeps referring to Sourceforge example. The other examples I found didn't work for setting up public keys

how to extract two versions of file for comparison

2005-07-14 Thread NoPlatitudes
I am trying to get the difference between the latest working version of a file and a previous version. I need to use a third party tool to examine this difference (cvs's diff functionality won't do what I want here). I want the newest version to remain in my 'standard' working directory, and I'd

Re: how to extract two versions of file for comparison

2005-07-14 Thread Andy Jones
try something like: cvs update -r [version] -p [filename] temp/[filename] On 14 Jul 2005 06:16:04 -0700, NoPlatitudes [EMAIL PROTECTED] wrote: I am trying to get the difference between the latest working version of a file and a previous version. I need to use a third party tool to examine

Re: how to extract two versions of file for comparison

2005-07-14 Thread NoPlatitudes
Many thanks... ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs

RE: how to extract two versions of file for comparison

2005-07-14 Thread Dave Korn
Original Message From: NoPlatitudes Sent: 14 July 2005 14:16 I am trying to get the difference between the latest working version of a file and a previous version. I need to use a third party tool to examine this difference (cvs's diff functionality won't do what I want here). I

Exact branching date?

2005-07-14 Thread Sensei
Hi. I'm new to branching, I always used it just as tagging versions, never joining back with head... so pleas excuse me being naive :) I'd like to know if it's possible to know the exact date when a branching has been applied, without sticky dates, since I have none in my repository. I'd

Re: cvs tag performance

2005-07-14 Thread Mark D. Baushke
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hridyesh Pant [EMAIL PROTECTED] writes: Hi All, My cvs tag command is suddenly taking too much time while tagging a code of 2GB .It is affecting our performance. My system configuration after top command is as below 11:47am up 66 days,

Re: Exact branching date?

2005-07-14 Thread Mark D. Baushke
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Sensei [EMAIL PROTECTED] writes: Hi. I'm new to branching, I always used it just as tagging versions, never joining back with head... so pleas excuse me being naive :) I'd like to know if it's possible to know the exact date when a branching

CVS Client on VMS 7.3-1 and SSH

2005-07-14 Thread Roger Yanda
I'm using ssh on VMS to connect to a Linux box that has Concurrent Versions System (CVS) 1.11.20 (client/server)[ The VMS side has Concurrent Versions System (CVS) 1.11.20 (client) When I do a connect, I get the following error $ cvs co smile cvs [checkout aborted]: can't set close-on-exec

Any consequences over removing a subdir permanently?

2005-07-14 Thread S I
Hi I know how to delete and commit files to the attic and on the next checkout do a -P to prune out empty dirs but I have not seen any documentation on how to remove empty dirs/subdirs permanently. Is this not recommended lest you have to retrieve dead files later? And CVS wouldn't know what

Re: Any consequences over removing a subdir permanently?

2005-07-14 Thread S I
Thank you as always. Do you think though that deleting a dir and later retrieving a dead file would confuse the dead file where to implant itself? I have a dummy repository and I'm going to try this to find out the outcome. The subdirs I speak of are about 5 years old and don't think anyone

RE: CCASE data import into CVS

2005-07-14 Thread Buozis, Martynas
Mark Thank you for your promptly reply. Actually link you provided was very useful - I was going to checkout version from CCASE and checkin in CVS. With files access method, described in that link, I will be able to write script for CCASE part much faster. I do not think, that I will end with

Re: Any consequences over removing a subdir permanently?

2005-07-14 Thread Todd Denniston
S I wrote: Thank you as always. Do you think though that deleting a dir and later retrieving a dead file would confuse the dead file where to implant itself? Well ... if you rm -fr'd the directory structure the file was in, you'll likely be confused yourself, because not only is there no

Re: Any consequences over removing a subdir permanently?

2005-07-14 Thread Todd Denniston
Todd Denniston wrote: Clerity demands I respond to my own post. sorry. S I wrote: SNIP We have restructured our code so many times and we may soon port over to a completely clean repository without its history. So in our case it shouldn't matter but I see your point about NOT

Re: cvs tag performance

2005-07-14 Thread Rahul
run iostat -x 3 or equivalent to monitor the disk for contention. Look for stats like (see man iostat). On Linux : avgqu-sz The average queue length of the requests that were issue to the device. await The average time (in milliseconds) for I/O

Re: Smart CVS

2005-07-13 Thread Liquidchild
The reason i am using locks is because the files are XML, and as far as i know when CVS trys to merge XML it can result in invalid XML. I do however remember on previous uses of CVS the option to check stuff out as read only. However I cannot find that option now, this option was on the WinCvs

Re: cvs branch version

2005-07-13 Thread david
Hi, I used 'cvs tag' to add a file to a branch. I then used 'cvs commit -r... ' to check in a new version. It normally creates a subversion from the version initially tagged. For example, I tag file 'A' version 1.1 with release-patch. It creates a version 1.1.0.2 for the tag. When I

Re: Smart CVS

2005-07-13 Thread Todd Denniston
Liquidchild wrote: The reason i am using locks is because the files are XML, and as far as i know when CVS trys to merge XML it can result in invalid XML. I do however remember on previous uses of CVS the option to check stuff out as read only. However I cannot find that option now, this

MAKE MONEY

2005-07-13 Thread Julius Herzfeld
MAKE MONEY!!! MAKE THOUSANDS!!! WELL GUESS WHAT!!! Within seven days, I started getting money in the mail!! I was shocked!! I figured it would end soon, but the money just kept coming in. In my first week, I made about $25.00. By the end of the second week I had made a total of more than

Re: How do I get a barebone stripped off list of files changedbetween 2 builds?

2005-07-13 Thread S I
Ok that worked beautifully, thank you again. :) Original Message Follows From: Robert Clark [EMAIL PROTECTED] To: info-cvs@gnu.org Subject: Re: How do I get a barebone stripped off list of files changedbetween 2 builds? Date: Tue, 12 Jul 2005 16:40:05 -0400 MIME-Version: 1.0 Received:

problem with the Tortoise ssh -pw password option

2005-07-13 Thread Ed
I know this is an insecure method, but I'm going crazy typing in my password every 2 seconds, and the pageant, puttygen, option keeps referring to Sourceforge example. The other examples I found didn't work for setting up public keys on the cvs server I'm using. but anyway So, it's bad when the

Annotate of Log output wrong

2005-07-12 Thread Ming Kin Lai
This is to continue the discussion of the thread with the same subject that started on Dec 7, 2004. The original discussion appeared to focus on the expansion of the $Log$ keyword both in the file and as output by the cvs annotate command (under version 1.11.17); but I think other keywords such

disable changes of local file

2005-07-12 Thread cgorac
Got large data file in project that I've imported to the repository along with other files. I'd like this file to be kept in repository, but that local changes (this file is changend often locally, because of testing) do not change the copy in repository and that during an update from repository

RE: Annotate of Log output wrong

2005-07-12 Thread Ming Kin Lai
As a comparison, cvs diff considers the source file modified for the keyword expansion. That is, $ cvs diff -r 1.3 -1.2 retrieving revision 1.3 retrieving revision 1.2 diff -r1.3 -r1.2 1,2c1,2 $Id: compiler.c,v 1.3 2005/07/12 03:10:28 mingl Exp $ this is $Date: 2005/07/12 03:10:28 $ ---

Inaccurate documentation re cvs tag

2005-07-12 Thread Ming Kin Lai
Sec 4.5 of 1.11.20 cederqvist says: running the cvs tag command without arguments causes CVS to select the revisions which are checked out in the current working directory. ... One potentially aspect of the fact that cvs tag operates on the repository is that you are tagging the checked-in

CCASE data import into CVS

2005-07-12 Thread Buozis, Martynas
Hello Is it possible to import data from CCASE into CVS ? If yes - how ? Thanks. Martynas ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs

How to share files between CVS projects?

2005-07-12 Thread Adam Lipscombe
Folks, Apologies if this question is a no-brainer. I have basic CVS knowledge but not more. I have 2 versions of source code. In each version only a very few files are different - about 5 in total out of a total of @950. What I want to do is to share the files that are not different to be

Re: Inaccurate documentation re cvs tag

2005-07-12 Thread Todd Denniston
Ming Kin Lai wrote: Sec 4.5 of 1.11.20 cederqvist says: running the cvs tag command without arguments causes CVS to select the revisions which are checked out in the current working directory. ... One potentially aspect of the fact that cvs tag operates on the repository is that you are

Re: Annotate of Log output wrong

2005-07-12 Thread Todd Denniston
Ming Kin Lai wrote: This is to continue the discussion of the thread with the same subject that started on Dec 7, 2004. The original discussion appeared to focus on the expansion of the $Log$ keyword both in the file and as output by the cvs annotate command (under version 1.11.17); but I

Re: CCASE data import into CVS

2005-07-12 Thread Mark D. Baushke
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Buozis, Martynas [EMAIL PROTECTED] writes: Is it possible to import data from CCASE into CVS ? If yes - how ? Thanks. You should use a search engine to find prior art... something like this describes how you might go about writing one for

RE: How to share files between CVS projects?

2005-07-12 Thread Matt Doar
Search for modules and ampersand modules to combine different directories into one project, or keep the changes to one set of files on a branch. ~Matt -Original Message- From: [EMAIL PROTECTED] [mailto:info-cvs- [EMAIL PROTECTED] On Behalf Of Adam Lipscombe Sent: Tuesday, July 12,

RE: Is it OK to post an EAP/beta invitation for a product thatintegrates with CVS?

2005-07-12 Thread Matt Doar
I'd say sure, if it's just one post (text not HTML). And if the product is any good ;-) ~Matt -Original Message- From: [EMAIL PROTECTED] [mailto:info-cvs- [EMAIL PROTECTED] On Behalf Of Slavik Sent: Monday, July 11, 2005 11:54 PM To: info-cvs@gnu.org Subject: Is it OK to post an

Re: Smart CVS

2005-07-12 Thread Rahul
We have seen similar problems with the SmartCVS zlib compression. In fact yesterday our QA found an issue with SmartCVS 4.0.5 whereby connection closes by server was causing java io exception in the Java zlib input stream handler in SmartCVS. With compression disabled all was well.

Re: How to share files between CVS projects?

2005-07-12 Thread Todd Denniston
Adam Lipscombe wrote: Folks, Apologies if this question is a no-brainer. I have basic CVS knowledge but not more. I have 2 versions of source code. In each version only a very few files are different - about 5 in total out of a total of @950. What I want to do is to share the files

How do I get a barebone stripped off list of files changed between 2 builds?

2005-07-12 Thread S I
Hi I'm trying to get a stripped down list of files modified and committed between 2 builds or a build and my working folder in CVS. I would just like to see the path/filename only. Compare it to a list received from the developers to verify we're in synch, do the build and deliver their

Re: Smart CVS

2005-07-12 Thread Todd Denniston
Liquidchild wrote: Guys Finally got it all working! woho! Great. Only question I have left is can you make files read only in smartCVS so that users have to select the file for editing first, to stop other users being able to edit the same file at the same time? Canonical answer:

Re: How do I get a barebone stripped off list of files changed between 2 builds?

2005-07-12 Thread Robert Clark
On Tuesday July 12, 2005 03:58 pm, S I [EMAIL PROTECTED] wrote: I'm trying to get a stripped down list of files modified and committed between 2 builds or a build and my working folder in CVS. I would just like to see the path/filename only. What I generally do is use the rdiff command with

Re: How do I get a barebone stripped off list of files changed between2 builds?

2005-07-12 Thread Todd Denniston
S I wrote: Hi I'm trying to get a stripped down list of files modified and committed between 2 builds or a build and my working folder in CVS. I would just like to see the path/filename only. Compare it to a list received from the developers to verify we're in synch, do the build and

Re: Inaccurate documentation re cvs tag

2005-07-12 Thread Ming Kin Lai
Sec 4.5 of 1.11.20 cederqvist says: running the cvs tag command without arguments causes CVS to select the revisions which are checked out in the current working directory. ... One potentially aspect of the fact that cvs tag operates on the repository is that you are tagging the

Re: How do I get a barebone stripped off list of files changed between 2 builds?

2005-07-12 Thread Slavik
Hello, --- S I [EMAIL PROTECTED] wrote: Hi I'm trying to get a stripped down list of files modified and committed between 2 builds or a build and my working folder in CVS. I would just like to see the path/filename only. Compare it to a list received from the developers to verify we're

Re: CVS Export

2005-07-12 Thread Larry Jones
Liquidchild writes: When i run the cvs export command either through WinCVS or on the command line using [...] it exports the ecc module with the CVSROOT folders and CVS folders. Have you looked at the repository to see if someone managed to actually add those directories to it? -Larry

Re: Locking CVS

2005-07-12 Thread Larry Jones
Jim Hyslop writes: If you want to lock all projects, then create an empty $CVSROOT/CVSROOT/writers file. I believe this will work for all access methods, not just pserver. You believe incorrectlly. The readers and writers files only affect pserver. -Larry Jones You should see me when I

Re: Error while checking out.

2005-07-12 Thread Larry Jones
Sumit Dey writes: cvs [server aborted]: cannot write D:/CVSRepo/Project342/CVSROOT/val-tags: Permission denied Any help will be greatly appreciated. I don't see how the error message could be any clearer -- you need to change the permissions on your val-tags file so that anyone can write

cvs branch version

2005-07-12 Thread Mei-Xing Zhao
Hi, I used 'cvs tag' to add a file to a branch. I then used 'cvs commit -r... ' to check in a new version. It normally creates a subversion from the version initially tagged. For example, I tag file 'A' version 1.1 with release-patch. It creates a version 1.1.0.2 for the tag. When I check in

Re: cvs branch version

2005-07-12 Thread Qian Xin
ypi can use wincvs or other GUI front to help you. If you are not very familiar with the command line opition, and the operation. Enjoy. ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs

Re: disable changes of local file

2005-07-12 Thread Pierre Asselin
[EMAIL PROTECTED] wrote: Got large data file in project that I've imported to the repository along with other files. I'd like this file to be kept in repository, but that local changes (this file is changend often locally, because of testing) do not change the copy in repository and that

Re: How do I get a barebone stripped off list of files changed between

2005-07-12 Thread Larry Jones
S I writes: I'm trying to get a stripped down list of files modified and committed between 2 builds or a build and my working folder in CVS. I would just like to see the path/filename only. Compare it to a list received from the developers to verify we're in synch, do the build and

Re: Annotate of Log output wrong

2005-07-12 Thread Larry Jones
Ming Kin Lai writes: The original discussion appeared to focus on the expansion of the $Log$ keyword both in the file and as output by the cvs annotate command (under version 1.11.17); but I think other keywords such as $Id$ have the same problem. They do. The bottom line is that

Pbm updating sandbox

2005-07-11 Thread Muriel Delaveau
Hello, An user has put a new source in the repository. But other users can't even see the new source when updating their sandbox even which tkcvs. What can be the reason ? Thanks for your help. ___ Info-cvs mailing list Info-cvs@gnu.org

Error while checking out.

2005-07-11 Thread Sumit Dey
Hi all, I am getting the following error message when I try to checkout using a tag. I can see the tag existing when I display the graph. "cvs [server aborted]: cannot write D:/CVSRepo/Project342/CVSROOT/val-tags: Permission denied" Any help will be greatly appreciated. Thanking you,With

CVS Export

2005-07-11 Thread Liquidchild
When i run the cvs export command either through WinCVS or on the command line using cvs export -r DNOW ecc it exports the ecc module with the CVSROOT folders and CVS folders. Can anyone give me a hint, or preferably the answer as to what I am doing wrong! Thanks in advance guys S.

Re: Pbm updating sandbox

2005-07-11 Thread Todd Denniston
Muriel Delaveau wrote: Hello, An user has put a new source in the repository. But other users can't even see the new source when updating their sandbox even which tkcvs. What can be the reason ? Thanks for your help. Assumption, the user who put the new source in the repository, did

Re: Locking CVS

2005-07-11 Thread Jim Hyslop
S I wrote: Hi everyone, I'm planning to lock cvs today getting ready for our release. I realize with certain version control software nowadays you don't have to lock the repo and the developers can continue with their work. However, we're imposing and enforcing a few days for freeze and to

Re: Locking CVS

2005-07-11 Thread S I
Thank you. I'm not sure what /bin/test represents? To be replaced with the path to my proj? Original Message Follows From: Mark D. Baushke [EMAIL PROTECTED] To: S I [EMAIL PROTECTED] CC: info-cvs@gnu.org Subject: Re: Locking CVS Date: Mon, 11 Jul 2005 08:49:43 -0700 MIME-Version: 1.0

Re: Locking CVS

2005-07-11 Thread S I
All 3 projects are under /usr/local/cvs/proj1 thru 3. I just added a blank writers file. Will this do it until I do a final build, tag, and branch? Original Message Follows From: Todd Denniston [EMAIL PROTECTED] To: S I [EMAIL PROTECTED] CC: info-cvs@gnu.org Subject: Re: Locking CVS

Re: Locking CVS

2005-07-11 Thread Todd Denniston
S I wrote: Hi everyone, I'm planning to lock cvs today getting ready for our release. I realize with certain version control software nowadays you don't have to lock the repo and the developers can continue with their work. However, we're imposing and enforcing a few days for freeze and

Re: Locking CVS

2005-07-11 Thread Mark D. Baushke
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 S I [EMAIL PROTECTED] writes: Thank you. I'm not sure what /bin/test represents? To be replaced with the path to my proj? It represents the /bin/test (see 'man test' on your GNU/Linux box for more details) command to compare the output of the `id

cannot open /nonexistant/.cvsignore: Permission denied

2005-07-11 Thread Boris Landa
Title: cannot open /nonexistant/.cvsignore: Permission denied Hello Colleagues, Its my second posting on the same issue. I am relatively new to CVS and I would really appreciate if somebody could help me to understand the root cause of the problem. I am using CVS version 1.11.17 for both

RE: Status of CVS on OpenVMS

2005-07-11 Thread ai26
In a message of Mon, 11 Jul 2005 16:34:04 +0200 Received on Mon, 11 Jul 2005 17:15:49 +0200 Andreas Lalloo [EMAIL PROTECTED] wrote to info-cvs@gnu.org Hello list! What is the status regarding support for OpenVMS on client side (pserver)? We are running a software shop where we have a range

Re: cannot open /nonexistant/.cvsignore: Permission denied

2005-07-11 Thread Todd Denniston
Boris Landa wrote: Hello Colleagues, It's my second posting on the same issue. I am relatively new to CVS and I would really appreciate if somebody could help me to understand the root cause of the problem. I am using CVS version 1.11.17 for both client and server. My server is in

Re: migration of CVS repositery from one machine to another

2005-07-11 Thread ravish agarwal
One more query... do I need to create the repositery by cvs -d CVSROOT init or just by creating a folder and copying the files from existing repositery will do. On 7/6/05, Jim Hyslop [EMAIL PROTECTED] wrote: ravish agarwal wrote: Does that mean that by only copying the files of the repositery

newbie CVSROOT/passwd questions

2005-07-10 Thread Huaer XC
Dear CVS users: I am a pretty newbie in cvs admin, could someone take a little time to guide me through the following problems: 1) In file CVSROOT/passwd, If I define: huaer:pswd:cvs where huaer is not a system userID. Now I want to communicate between the repository and sandbox with

Re: how do I undo local changes

2005-07-09 Thread Spiro Trikaliotis
Hello, adding to what Jason and Rahul said: * On Fri, Jul 08, 2005 at 03:27:13PM -0700 MEENA SELVAM wrote: but in CVS I only find the cvs admin -o command to revert to older versions. But how can i simply undo the changes locally, without concerning about version? From your statement, I am

Re: add new files to branch

2005-07-09 Thread Pierre Asselin
Mei-Xing Zhao [EMAIL PROTECTED] wrote: Thanks. cvs tag works. But after running this cvs tag command, do I do a cvs add to add this file the the branch? It's already added. Just switch your sandbox to the branch, cvs update -r release-1-patch and you'll find that the file is now present.

Re: error while installing CVS 1.11.20

2005-07-08 Thread ravish agarwal
I installed gcc and biasom Now, I am getting following error message: usr/ccs/bin/ld: Warning At least one PA 2.0 object file add.o was detected. The linked output may not run on a PA 1.x system/usr/ccs/bin/ld: Unsatisfied sysmbols:GSS_C_NT_HOSTBASED_SERVICE (first referenced in client.o)

Re: Smart CVS

2005-07-08 Thread Liquidchild
Guys Finally got it all working! woho! Only question I have left is can you make files read only in smartCVS so that users have to select the file for editing first, to stop other users being able to edit the same file at the same time? Thanks for all the help!

Re: CVS and SSH V2

2005-07-08 Thread Liquidchild
Guys Finally got it all working! woho! Only question I have left is can you make files read only in smartCVS so that users have to select the file for editing first, to stop other users being able to edit the same file at the same time? Thanks for all the help!

Re: Possible Spam: Re: CVS and SSH V2

2005-07-08 Thread Liquidchild
Guys Finally got it all working! woho! Only question I have left is can you make files read only in smartCVS so that users have to select the file for editing first, to stop other users being able to edit the same file at the same time? Thanks for all the help!

merging branch to HEAD when branch contains partly trunk changes already

2005-07-08 Thread HK
Suppose the following situation. +-1.25.2 .. -- 1.25.2.2 -- 1.25.2.5 | ^ | |merge in 1.25 -- ... -- 1.27 -- ... -- 1.31 At 1.25 I created a branch. Later I merged the changes between 1.25 and 1.27 into the branch at 1.25.2.2 to have minor updates of the main trunk

Re: merging branch to HEAD when branch contains partly trunk changes already

2005-07-08 Thread Russ Sherk
Herald, On 8 Jul 2005 03:46:00 -0700, HK [EMAIL PROTECTED] wrote: Suppose the following situation. +-1.25.2 .. -- 1.25.2.2 -- 1.25.2.5 | ^ | |merge in 1.25 -- ... -- 1.27 -- ... -- 1.31 At 1.25 I created a branch. Later I merged the changes between 1.25

Re: error while installing CVS 1.11.20

2005-07-08 Thread Russ Sherk
On 7/8/05, ravish agarwal [EMAIL PROTECTED] wrote: I installed gcc and biasom Now, I am getting following error message: usr/ccs/bin/ld: Warning At least one PA 2.0 object file add.o was detected. The linked output may not run on a PA 1.x system /usr/ccs/bin/ld: Unsatisfied sysmbols:

Re:

2005-07-08 Thread Dennis W. Bulgrien
___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs

Re: Retrieving dead files from the Attic

2005-07-08 Thread Dennis W. Bulgrien
___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs

Re: Retrieving dead files from the Attic

2005-07-08 Thread S I
See page 113 of the Repository Admin: cd into the folder where you need to retrieve the file and do c:cvs -Q update -p -r 1.1 foo.jpg foo.jpg c:dir (to verify) c:cvs add -kb foo.jpg c:cvs ci -m comment foo.jpg Original Message Follows From: Dennis W. Bulgrien [EMAIL PROTECTED] To:

how do I undo local changes

2005-07-08 Thread MEENA SELVAM
Hi, I checkedout a file from a repository for first time. i modified it. but i do not want my changes. now i want to do a cvs update to get others changes. but i will be asked for merging. i want to avoid that step. even i want to prevent automatic merging so i need to undo the changes. in

Re: how do I undo local changes

2005-07-08 Thread Rahul
You can do : 1. cvs up -C file You will see a msg similar to (Locally modified license.props moved to .#license.props.1.1) It will pull the latest from CVS tree and save the current changes in a .# file 2. rm file and pull again - cvs co/up Regards, Rahul Bhargava CTO, WANdisco

add new files to branch

2005-07-08 Thread Mei-Xing Zhao
Hi, I like to know how to add a file to an existing branch. Following is my env: o I have created branch tag release-1-patch from the main trunk base on tag release-1. o Then I have a file A checked in main trunk as v1.5 and the file is tagged as release-2 How do I add file A to the branch

RE: how do I undo local changes

2005-07-08 Thread Jason Sicotte
$ cvs -H up Usage: cvs.exe update [-APCdflRp] [-k kopt] [-r rev] [-D date] [-j rev] -A Reset any sticky tags/date/kopts. -P Prune empty directories. -C Overwrite locally modified files with clean repository copies. ( . . . ) -W spec

Re: merging branch to HEAD when branch contains partly trunk changes already

2005-07-08 Thread Pierre Asselin
HK [EMAIL PROTECTED] wrote: Suppose the following situation. +-1.25.2 .. -- 1.25.2.2 -- 1.25.2.5 | ^ | |merge in 1.25 -- ... -- 1.27 -- ... -- 1.31 At 1.25 I created a branch. Later I merged the changes between 1.25 and 1.27 into the branch at 1.25.2.2 to

Re: add new files to branch

2005-07-08 Thread Pierre Asselin
Mei-Xing Zhao [EMAIL PROTECTED] wrote: [ ... ] cvs rtag -b -r release-2 release-1-patch A Just use cvs tag instead of cvs rtag (and do it from a trunk sandbox where the A file is present). -- pa at panix dot com ___ Info-cvs mailing list

Re: add new files to branch

2005-07-08 Thread Mei-Xing Zhao
Pierre Asselin wrote: Mei-Xing Zhao [EMAIL PROTECTED] wrote: [ ... ] cvs rtag -b -r release-2 release-1-patch A Just use cvs tag instead of cvs rtag (and do it from a trunk sandbox where the A file is present). Thanks. cvs tag works. But after running this cvs tag command, do I do a

Re: add new files to branch

2005-07-08 Thread Mei-Xing Zhao
Thanks. cvs tag works. But after running this cvs tag command, do I do a cvs add to add this file the the branch? I am not sure if I run the cvs add command, will it add the file to the main trunk or in the branch? Thanks, Mei Pierre Asselin wrote: Mei-Xing Zhao [EMAIL PROTECTED] wrote: [

RE: cvs error: received broken pipe signal

2005-07-07 Thread Yu He
Thanks a lot for your reminding. - host OS information for server: Redhat 9 - host OS information for client: Window 2000 - server version of cvs: cvs 1.11.6 - client version of cvs: wincvs 1.3 - nature of commitinfo, verifymsg, loginfo scripts being used (if any): in the attachment

Re: cvs error: received broken pipe signal

2005-07-07 Thread Mark D. Baushke
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Yu He [EMAIL PROTECTED] writes: Hi all: After commit,always receive the following error message, cvs [server aborted]: received broken pipe signal What's the reason? Thanks a lot in advance! You have provided insufficient information as

Re: cvs error: received broken pipe signal

2005-07-07 Thread Mark D. Baushke
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Yu He [EMAIL PROTECTED] writes: Thanks a lot for your reminding. - host OS information for server: Redhat 9 - host OS information for client: Window 2000 - server version of cvs: cvs 1.11.6 - client version of cvs: wincvs 1.3 - nature of

CVS ( Status of lock files in the repository)

2005-07-07 Thread surya prakash babu bhattirplou74
Hi all, I would like have ascriptwhich will show me all the user names who have locked a particular file along with the filename , the timestamp and path of that file locked. Thanks in Advance. regards surya` Free antispam, antivirus and 1GB to save all your messages Only in Yahoo! Mail:

Re: cvs error: received broken pipe signal

2005-07-07 Thread Mark D. Baushke
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 These two lines need to dispose of stdin: Original: project1 (chgrp -Rf project1 /usr/local/cvsroot/project1) project2 (chgrp -Rf project2 /usr/local/cvsroot/project2) Revised: project1 (chgrp -Rf project1 /usr/local/cvsroot/project1; cat)

How can I administratively freeze a branch?

2005-07-07 Thread r.pedroche.novillo
Greetings. I have a project which was branched some time ago and now the branch has been merged back to HEAD. No further changes must be made to the old "DEV2" branch, it is officially dead. Is there a way I can prevent developers from mistakenly committing to that branch (appart

RE: How can I administratively freeze a branch?

2005-07-07 Thread Dave Korn
Original Message From: [EMAIL PROTECTED] Sent: 07 July 2005 11:09 Greetings. I have a project which was branched some time ago and now the branch has been merged back to HEAD. No further changes must be made to the old DEV2 branch, it is officially dead. Is there a way I

RE: How can I administratively freeze a branch?

2005-07-07 Thread r.pedroche.novillo
Why not just cvs rm all the files from it, so they no longer exist at the head of the branch? People would have to accidentally checkout old revisions before they could accidentally commit to it; that's pretty improbable I think. The problem is that files from old branch still exist

Smart CVS

2005-07-07 Thread Liquidchild
Guys, I posted on here recently with regards to using SSH and SmartCvs, I have (i think) made a little head way in this but when trying to get the modules to read from smartCVS checkout project option i am getting the following: An i/o error occured, details: Unknown Compression method I have

pserver user id's

2005-07-07 Thread foomonkey
Hello. I have a repository configured and working with pserver. I want to restrict user's permissions on subdirectories in the repository. I don't want user A to see user B's projects and vice versa. In my $CVSROOT/CVSROOT/passwd file, I have something like: divap:YBGW948yOKKSA:cvsadm divap is

Re: Possible Spam: Re: CVS and SSH V2

2005-07-07 Thread Derek Price
Russ Sherk wrote: I think you can put the port into CVS_RSH. Here is mine on winXP using plink: Z:\echo %CVS_RSH% d:\Tools\plink.exe -ssh -pw xx Z:\echo %CVSROOT% :ext:[EMAIL PROTECTED]:/var/cvs --- Does this not work on linux? No. It's an implementation difference. The

Re: pserver user id's

2005-07-07 Thread Julian Opificius
foomonkey wrote: Hello. I have a repository configured and working with pserver. I want to restrict user's permissions on subdirectories in the repository. I don't want user A to see user B's projects and vice versa. In my $CVSROOT/CVSROOT/passwd file, I have something like:

Re: Problem with admin privileges

2005-07-07 Thread Julian Opificius
Todd Denniston wrote: CLIP The only reason I am using pserver is that it allows my users to have CVAS controlled access to the respositories without giving them dierct write access to them. If you can suggest another way of doing that, I'd be glad to use it. As Far As I Know, you are

Re: pserver user id's

2005-07-07 Thread foomonkey
I believe my problem lies in that my inetd.conf specifies to run cvspserver under the cvsadm user account. When I have my $CVSROOT/CVSROOT/passwd file configured like, username:password:cvsadm, everything works great. With the exception that user A can see user B's projects and vice versa. This is

Re: pserver user id's

2005-07-07 Thread Larry Jones
foomonkey writes: If I change the passwd file to look like this: divap:YBGW948yOKKSA:divap Note that you can just omit the third field entirely in that case. I get an error when I try to run a 'checkout' on a project in the divap directory that says: cvs [checkout aborted]:

Re: pserver user id's

2005-07-07 Thread Larry Jones
foomonkey writes: I may be missing something but that's the way things appear to me. Is there any danger in having pserver run as root? inetd.conf contains many other services running as root. I realize that ANY service running as root or otherwise introduces certain vulnerabilities. You've

  1   2   3   4   5   6   7   8   9   10   >