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: [