Re: CVS Connection Refuse
in localhost, I type telnet localhost 2401 - conncetion refused. in remote host, I type cvs co project.. this suggests that your cvs server is not up. verify that its running.. HTH Rohan ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: merging from HEAD into a branch?
I've tried 'cvs update -jHEAD' but it doesn't do anything ... Try cvs update -d -jHEAD -Rohan ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: cannot open CVS/Repository: Permission denied (but it can for other Reps)
You can check the permissions of file/folder in your new repository at server side. if they are not accessible by the system user which corresponds to actual cvs user, you will get this error. HTH Rohan [EMAIL PROTECTED] wrote: Hello I have set up a cvs server in my office that can be connected via ssh. I have no problem to issue any cvs command on two of the three respositories that I have. However on the third one cvs returns: cvs [log aborted]: cannot open CVS/Repository: Permission denied What can be wrong? Many thanks Ed PS. On the server side everything works fine. server runs cvs 1.11.2 client runs cvs 1.11.16 ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Restoring single file in project
cd path to your checkout cvs update -C your_file this will take latest copy of the file. note that your local changes in that file will be lost. so you may need to backup that file before you do this. HTH Rohan Michael Satterwhite wrote: First, I want to thank those who responded to my last query. I'm learning CVS (coming from a Windows environment). Assume for a moment that I have a project abc that I have just retrieved from a CVS repository. After working for a while, I realize that I've been going down a blind alley on one of the source files. Everything else I've done is fine, but I need to get that one source file back. How can I retrieve the latest copy of a single source file, overwriting the (probably later) file in my work directory? Thanks in advance for the help. ---Michael ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Can I restrict some users to create a branch?
No. In my opinion there is no such direct mechanism available. -Rohan Paras jain wrote: Dear List, Can I restrict some users to create a branch in the repository? Any link or comments in this direction is helpful. Thanks and Regards Paras ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Cvs merge problem
Please send mail only in Plain Text format. There are seven developers in the team. The problem developer facing is when their branch is merged in to the development branch the files which have been changed earlier or updated in the development branch gets updated with the changes from the branch and some files show conflicts but the file which has never been updated or touched by any developer before in their branch is merged with some changes made by one developer do not show changes in the development branch. The rest of the files With my understanding of the problem If a developer has not changed a file in his branch then you don't see merge or difference in his branch. Can you identify what kind of changes those file shows when they are merged into the main trunk? BTW, why each developer has his own branch? Cann't they work on the trunk simulataneously which is the advantage of CVS? HTH Rohan ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Cannot commit after mergeing a branch to main
As the commit error message and status command suggests, when you merged file into the trunk, it resulted into some conflicts. You need to resolve those before you commit. May be cvsnt mailing list will give you more relevent answer. -Rohan Nishad wrote: After merging a branch to the main trunk, I am unable to commit some files. I got the following error while trying to commit the file. (This is happening only to the new files created in the branch and Generated in the working folder after the merge process.) cvs commit -m Merged from brach_b on main trunk Editxxx.asp cvs server: Up-to-date check failed for `Editxxx.asp' cvs [server aborted]: correct above errors first! Please help. I am using CVSNT on Win2K platform. When I checked the status, it is showing as below. File: Editxxx.asp Status: Unresolved Conflict Thanks Nishad [EMAIL PROTECTED] ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Problem in merge in cvs
Hi Ramanuj I am facing a wierd problem. There is a branch on main trunk i.e. dev branch. In this branch different developer create their branches and merge their each branh into main trunk after completing their task. I don't think this idea would work as it is. Developers are using Tortoise CVS as their tool. When a developer merges his branch after one developer has already merged his branch into dev branch instead of file getting update with the another merge get overridden by the file of last developer who has merged the file. The problem would always occur. The reasoning is that both developers create branch from one version and then first devel. commits its changes to trunk. But second devel would not have these changes in his copy. So when he tries to merge the file into trunk, CVS would think that in the new version those changes are removed and would remove them in new version. This problem can also occur when one commits his changes without updating his local copy. One solution would be that each developer keeps merging regularly (or whenever other devel. merges his changes to trunk) the TRUNK into his branch so that his branch is updated and in sync with the Trunk. HTH Rohan ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Log Keywords
may be cvs status command is what you looking for. -Rohan Sjur Vestli wrote: Dear All, CVS does keyword subsitution ($Revision$, $State$, etc.). With the cvs log command I can extract the complete state of a particular file, including its current revision, state, etc. etc. in a rather verbose format. Is there a simple way of doing a log (or whatever) so that I get as ouput (only) the current revision (e.g. 1.4) or current state (e.g. Exp) etc. Kind regards Sjur J. Vestli ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: loosing branch when updating to a tag on the branch
[g5/production/codebase] breslow% cvs status robots.txt === File: robots.txtStatus: Up-to-date Working revision:1.3 Repository revision: 1.3 /usr/home/giro1150/cvsroot/codebase/robots.txt,v Sticky Tag: release_5_branch (branch: 1.3.4) Sticky Date: (none) Sticky Options: (none) [g5/production/codebase] breslow% cvs tag test_tag_in_branch [g5/production/codebase] breslow% cvs up -r test_tag_in_branch [g5/production/codebase] breslow% cvs status robots.txt === File: robots.txtStatus: Up-to-date Working revision:1.3 Repository revision: 1.3 /usr/home/giro1150/cvsroot/codebase/robots.txt,v Sticky Tag: test_tag_in_branch (revision: 1.3) Sticky Date: (none) Sticky Options: (none) Your branch is not lost, cvs just updated the file from branch to one particular tag, whhich happens to be on trunk. This is because robots.txt is same for both trunk and branch( see its version is 1.3 for both). if you check in this file into the branch, its version will be increamented for branch and then cvs update on branch will give you the branch version. There is one more thing that tags are not associated with branches but its associated with versions. i.e. if you tag branch code, cvs wouldn't store that tag is for branch code. so when you update for that tag, it just takes out particular version of all files tagged with the tag. So you will never get, something like this, when you update on sticky tag. i.e no (brach:version) in Sticky Tag /usr/home/giro1150/cvsroot/codebase/robots.txt,v Sticky Tag: test_tag_in_branch ( branch: whatever_ver) Sticky Date: (none) Sticky Options: (none) ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: loosing branch when updating to a tag on the branch
[production/codebase/Objects] breslow% cvs status AbstractEntry.php === File: AbstractEntry.php Status: Up-to-date Working revision:1.17.4.1 Repository revision: 1.17.4.1 /usr/home/giro1150/cvsroot/codebase/Objects/AbstractEntry.php,v Sticky Tag: test_tag_in_branch (revision: 1.17.4.1) Sticky Date: (none) Sticky Options: (none) [production/codebase/Objects] breslow% I can see that the file is indeed the revision from the branch. But as now the sticky tag is the tag name I updated to the association with the branch is lost? (I now understand what Rohan says, tags are not associated with branches but with revisions of files.) I edited this file and tried to check it in and got the following: [production/codebase/Objects] breslow% cvs ci -m Will it check in to branch? AbstractEntry.php cvs server: sticky tag `test_tag_in_branch' for file `AbstractEntry.php' is not a branch cvs [server aborted]: correct above errors first! Tags are to basically to mark certain state of your code base for future references. so when you update on that tag you are going to that particular state - which is a state in past. As we cannot change our past, you cannot change this updated code in CVS. Its kind of readonly. Branches give you way to have separate code base, where you can change your code as required. When you update on branch tag (don't think -A would be needed, check man page though), you get the latest code of that branch. What is the correct practise here when you tag the state of your working directory when working in a branch, update to that tag (let's say to rollback a change) and want to check edits back in to the branch? Is it possible to update -A -r branch_name and that is how my edits would get merged into the branch and then I check in and I am good to go? I'm sorry, I don't understand what you want to do! BTW, If you want to rollback changes done in a branch after certain tag, - take branch code - take diff of a file with this tag - apply those changes to the file ( you can directly merge versions, see manual at www.cvshome.org for more help) - with cvs diff check the changes done - commit file the file - it will be commited in the branch HTH Rohan Many thanks, Todd On Jul 23, 2004, at 10:50 AM, Rohan Nandode wrote: [g5/production/codebase] breslow% cvs status robots.txt === File: robots.txtStatus: Up-to-date Working revision:1.3 Repository revision: 1.3 /usr/home/giro1150/cvsroot/codebase/robots.txt,v Sticky Tag: release_5_branch (branch: 1.3.4) Sticky Date: (none) Sticky Options: (none) [g5/production/codebase] breslow% cvs tag test_tag_in_branch [g5/production/codebase] breslow% cvs up -r test_tag_in_branch [g5/production/codebase] breslow% cvs status robots.txt === File: robots.txtStatus: Up-to-date Working revision:1.3 Repository revision: 1.3 /usr/home/giro1150/cvsroot/codebase/robots.txt,v Sticky Tag: test_tag_in_branch (revision: 1.3) Sticky Date: (none) Sticky Options: (none) Your branch is not lost, cvs just updated the file from branch to one particular tag, whhich happens to be on trunk. This is because robots.txt is same for both trunk and branch( see its version is 1.3 for both). if you check in this file into the branch, its version will be increamented for branch and then cvs update on branch will give you the branch version. There is one more thing that tags are not associated with branches but its associated with versions. i.e. if you tag branch code, cvs wouldn't store that tag is for branch code. so when you update for that tag, it just takes out particular version of all files tagged with the tag. So you will never get, something like this, when you update on sticky tag. i.e no (brach:version) in Sticky Tag /usr/home/giro1150/cvsroot/codebase/robots.txt,v Sticky Tag: test_tag_in_branch ( branch: whatever_ver) Sticky Date: (none) Sticky Options: (none) ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Import question
I had same problem some time back but don't have any solution to it.. you can go through http://lists.gnu.org/archive/html/info-cvs/2004-02/msg00077.html -Rohan Lemke, Michael IZ/HZA-IOP wrote: When I do a cvs import of a new vendor version the new files become the head revision. I'd like to do the import such that it doesn't affect HEAD. Only after I've tested the new stuff I want it to become HEAD. Of course, it should work with local changes merged in just like the standard way of doing it on the trunk. How can I do this? Thanks, Michael ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: I wrote bad comment, how to modify it?
This will help you... http://cvsbook.red-bean.com/cvsbook.html#I%20just%20committed%20some%20files%20with%20the%20wrong%20log%20message -Rohan Wade Yin wrote: After I made some modification, I commit the changes , but I wrote some error message about the code. How to get rid of it? Thanks Wade ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Merge to branch
If both main trunk and branch R18 are in sync till now, then you can merge the changes with following with branch as working copy. cvs update -j HEAD -j R18 your file names This also assumes that there are no commits to main trunk after your required changes. otherwise they will also be merged into the branch. HTH Rohan news wrote: Hello, I have a main trunk and a branch R18. Some changes (on 3 files) have been made by programmer on the main trunk but they should have been done in the R18 branch. I'd like the changes made on the three files to be merged (or just copied) to the R18 branch. Of course, the R18 branch should continue to live but with the changes (I hope my english is good enougth...). Thanks. Jean ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Regarding remote access to CVS server
may be this would help http://cvsbook.red-bean.com/cvsbook.html#The%20pserver%20access%20method%20is%20not%20working more information on what error you are getting would help -Rohan Narendra Kumar wrote: Hello, We have a CVS server setup on a Linux machine. The authentication mechanism selected is passwd. I have also installed a winCVS client setup on a Windows machine (both are on same LAN). I am trying to connect to CVS server thru this win-client. But, it is failing. Can anybody please help me with this. Regards Narendra __ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Regarding remote access to CVS server
Narendra Kumar wrote: CVSROOT is /home/cvs But, can we change it to pserver now? Yes, follow steps at the link in my prev. mail. -Narendra --- Rohan Nandode [EMAIL PROTECTED] wrote: As you mentioned earlier you are trying for password authentication. i guess to do that you need to set-up cvs as pserver. whats your cvs root? can u access the cvs from linux machine? -Rohan Narendra Kumar wrote: I am trying to connect from win-client. This is the error I got at client side: (Logging in to [EMAIL PROTECTED]) cvs [login aborted]: connect to barathi:2401 failed: Connection refused *CVS exited normally with code 1* My server is not configured as pserver. Do you think that can be a problem? -Narendra --- Rohan Nandode [EMAIL PROTECTED] wrote: may be this would help http://cvsbook.red-bean.com/cvsbook.html#The%20pserver%20access%20method%20is%20not%20working more information on what error you are getting would help -Rohan Narendra Kumar wrote: Hello, We have a CVS server setup on a Linux machine. The authentication mechanism selected is passwd. I have also installed a winCVS client setup on a Windows machine (both are on same LAN). I am trying to connect to CVS server thru this win-client. But, it is failing. Can anybody please help me with this. Regards Narendra __ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs __ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com __ Do you Yahoo!? New and Improved Yahoo! Mail - Send 10MB messages! http://promotions.yahoo.com/new_mail ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: cvs tag checkout
I would like to attach specific tags to some files and not modules or directories, how can I do that? cvs tag TAG_NAME list of files Also, how can I checkout only a file with a specific tag? to get files tagged with TAG_NAME in a module cvs co -r TAG_NAME module_name to get particular file cvs co -r TAG_NAME file_name HTH Rohan ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: cvs tag checkout
But now the problem is I cannot checkout only the files with a particular tag because the directory structure cannot be gotten rid of; if you already have checked out source, then you can use cvs update command: cvs update -r TAG_NAME module_name or cvs update -r TAG_NAME file_name also, speciying -P option would help. it prunes empty directories from the local copy. Did i understand ur problem correctly? -Rohan I am using a Unix repository. Thanks Khyati *Rohan Nandode [EMAIL PROTECTED]* 06/14/2004 11:37 AM Please respond to rohan_nandode To:Khyati Nayak [EMAIL PROTECTED] cc:[EMAIL PROTECTED] Subject:Re: cvs tag checkout I would like to attach specific tags to some files and not modules or directories, how can I do that? cvs tag TAG_NAME list of files Also, how can I checkout only a file with a specific tag? to get files tagged with TAG_NAME in a module cvs co -r TAG_NAME module_name to get particular file cvs co -r TAG_NAME file_name HTH Rohan ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: cvs tag checkout
No. I think the problem I am having now is that cvs checkout first checks out the entire directory, then tries to remove everything from under it except the ones with the tag we want. So it tries to remove it but says cannot remove DDD : directory not empty. I dont know if using a Unix repository has anything to do with this. I have repository on linux and dont see this kind of problem. Did you try checkout on another m/c? does cvs update also fails? May be you can get some more info at: http://cvsbook.red-bean.com/cvsbook.html#Some%20commands%20fail%20remotely%20but%20not%20locally%3b%20how%20should%20I%20debug%3f -Rohan Thanks Khyati *Rohan Nandode [EMAIL PROTECTED]* 06/14/2004 11:55 AM Please respond to rohan_nandode To:Khyati Nayak [EMAIL PROTECTED] cc:[EMAIL PROTECTED] Subject:Re: cvs tag checkout But now the problem is I cannot checkout only the files with a particular tag because the directory structure cannot be gotten rid of; if you already have checked out source, then you can use cvs update command: cvs update -r TAG_NAME module_name or cvs update -r TAG_NAME file_name also, speciying -P option would help. it prunes empty directories from the local copy. Did i understand ur problem correctly? -Rohan I am using a Unix repository. Thanks Khyati *Rohan Nandode [EMAIL PROTECTED]* 06/14/2004 11:37 AM Please respond to rohan_nandode To:Khyati Nayak [EMAIL PROTECTED] cc:[EMAIL PROTECTED] Subject:Re: cvs tag checkout I would like to attach specific tags to some files and not modules or directories, how can I do that? cvs tag TAG_NAME list of files Also, how can I checkout only a file with a specific tag? to get files tagged with TAG_NAME in a module cvs co -r TAG_NAME module_name to get particular file cvs co -r TAG_NAME file_name HTH Rohan ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Confusion with merging from the trunk and into the trunk
But I don't know how to make it properly: 1. cvs up -j feedback This option should work. As the merges from TRUNK to branch are already in the TRUNK, they won't affect. unless 'feedback' branch has changes in those too. -Rohan ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: listing of all the modules from a specified repository
See the listing in CVSROOT/modules file. more help at: http://cvsbook.red-bean.com/cvsbook.html#How_can_I_get_a_list_of_all_projects_in_a_repository_ -Rohan [EMAIL PROTECTED] wrote: We have implemented the command cvs checkout -d top .to checkout all the modules in a directorytop from a specified repository and it is working fine, Is there any cvs command which can give a list of all the modules from a specified repository instead of checking out all the modules from a repository. Thanks Regards, Shalini Gautam Method abc support team Xansa B-39,Sector-1 Noida 2,India 201301 CUG:830 2037 e:[EMAIL PROTECTED] Whilst this email has been checked for all known viruses, recipients should undertake their own virus checking as Xansa will not accept any liability whatsoever. This email and any files transmitted with it are confidential and protected by client privilege. It is solely for the use of the intended recipient. Please delete it and notify the sender if you have received it in error. Unauthorised use is prohibited. Any opinions expressed in this email are those of the individual and not necessarily the organisation. Xansa, Registered Office: 420 Thames Valley Park Drive, Thames Valley Park, Reading, RG6 1PU, UK. Registered in England No.1000954. t +44 (0)8702 416181 w www.xansa.com ___ 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: CVS won't update with latest revision
You would have to use -A flag while updating the file. the command would be $cvs update -A uartsw.c The reason is, when you update with -r, a sticky tag is attached to the file. you can see it in cvs status command. The sticky tag information is stored in CVS/Entries in the local checkout. So even it you delete the file the cvs will update on the sticky tag version. -A option removes any sticky tag present and updates with latest version. -Rohan g murkumar wrote: Hello I am having cvs update a directory with the latest version of a certain file. This is the sequence of event 1)I checkout out a old version of the file(i needed to compile an old build) cvs update -r 1.1 uartsw.c this command worked fine, I got the r1.1 revision 2)I then wanted to revert back to the latest version(r1.4) of the file. So I deleted the file uartsw.c and did cvs update The output was: $cvs update cvs update . cvs update: Updating . M demo.hex cvs update: warning: uartsw.c was lost U uartsw.c BUT to my suprise the CVS put back that OLD revision(r1.1) of the file that i checked out in step '1' . I expected it to put revision r1.4 (the latest revision) Accdg to the manual: 'cvs update', updates the directory with the most recent commited revision(which in my case is r1.4). But it didnt do that in my case it put the old r1.1. Also just as a sidenote I remember doing cvs checkout -r 1.1 uartsw.c I mistakedly thought this was the way to retrieve an old revision of a file. But then i saw the website and did step 1(cvs update -r 1.1 uartsw.c) instead. Did my cvs checkout command have anything to do with the problem? thanks __ Do you Yahoo!? Yahoo! Mail - More reliable, more storage, less spam http://mail.yahoo.com ___ 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: CVS won't update with latest revision
Hi, I don't think putting update -A in .cvsrc would be good option. It will override every update command. also probably give problems when you want to update to some specific version(cvs update -A -r ??), as you did. As there wouldn't be any sticky tag to files by default, hence normal update should work. -Rohan g murkumar wrote: Thanks Rohan Would it make send then to add update -A in my .cvsrc file. Since it would normally make sense to expect the cvs upadte command to freshen up the files in the directories with the latest revisions of the file ..right? I mean thats what cvs update is normally used for. Please advise. Thanks again --- Rohan Nandode [EMAIL PROTECTED] wrote: You would have to use -A flag while updating the file. the command would be $cvs update -A uartsw.c The reason is, when you update with -r, a sticky tag is attached to the file. you can see it in cvs status command. The sticky tag information is stored in CVS/Entries in the local checkout. So even it you delete the file the cvs will update on the sticky tag version. -A option removes any sticky tag present and updates with latest version. -Rohan g murkumar wrote: Hello I am having cvs update a directory with the latest version of a certain file. This is the sequence of event 1)I checkout out a old version of the file(i needed to compile an old build) cvs update -r 1.1 uartsw.c this command worked fine, I got the r1.1 revision 2)I then wanted to revert back to the latest version(r1.4) of the file. So I deleted the file uartsw.c and did cvs update The output was: $cvs update cvs update . cvs update: Updating . M demo.hex cvs update: warning: uartsw.c was lost U uartsw.c BUT to my suprise the CVS put back that OLD revision(r1.1) of the file that i checked out in step '1' . I expected it to put revision r1.4 (the latest revision) Accdg to the manual: 'cvs update', updates the directory with the most recent commited revision(which in my case is r1.4). But it didnt do that in my case it put the old r1.1. Also just as a sidenote I remember doing cvs checkout -r 1.1 uartsw.c I mistakedly thought this was the way to retrieve an old revision of a file. But then i saw the website and did step 1(cvs update -r 1.1 uartsw.c) instead. Did my cvs checkout command have anything to do with the problem? thanks __ Do you Yahoo!? Yahoo! Mail - More reliable, more storage, less spam http://mail.yahoo.com ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs __ Do you Yahoo!? Yahoo! Mail - More reliable, more storage, less spam http://mail.yahoo.com ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Multiple sources in a vendor branch
Hi Guys, Any suggestions for the problem?? Thanks Rohan Rohan Nandode wrote: Hi, The problem descriptions goes like this: I have a vendor branch(1.1.3) for 3rd party library - say library1 along with my project source in my CVS. I have done some modifications to the sources in library1. Now I there is a latest release of the library1 and I would like to upgrade it. But the problem is that I am not sure of how much stable will be the upgraded version. Hence I would like to work with whatever version of the library I have in the cvs and test the latest version of the library also. So when someone takes update from the cvs, I do not want him to take latest imported version of 'library1', but whatever was there before upgrading the library. More over, I cannot tell him to use some tagged version of the 'library1'! In short, I want to upgrade the sources in vendor branch, but sametime do not want them to be reflected directly to the users. The users should be able take upgraded version of a library1, by updating with some tag etc. Is this possible with CVS? Please let me know if there is any work around for this. The fast solution could be to create new separate vendor branch for latest version of library1. But in that case, I would not be able to able to merge the modification done into the latest version. Thanks in advance Rohan ___ 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
Multiple sources in a vendor branch
Hi, The problem descriptions goes like this: I have a vendor branch(1.1.3) for 3rd party library - say library1 along with my project source in my CVS. I have done some modifications to the sources in library1. Now I there is a latest release of the library1 and I would like to upgrade it. But the problem is that I am not sure of how much stable will be the upgraded version. Hence I would like to work with whatever version of the library I have in the cvs and test the latest version of the library also. So when someone takes update from the cvs, I do not want him to take latest imported version of 'library1', but whatever was there before upgrading the library. More over, I cannot tell him to use some tagged version of the 'library1'! In short, I want to upgrade the sources in vendor branch, but sametime do not want them to be reflected directly to the users. The users should be able take upgraded version of a library1, by updating with some tag etc. Is this possible with CVS? Please let me know if there is any work around for this. The fast solution could be to create new separate vendor branch for latest version of library1. But in that case, I would not be able to able to merge the modification done into the latest version. Thanks in advance Rohan ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
