Re: CVS Merge between branches in two different repositories
On Wed, Feb 23, 2005 at 05:03:23PM -0500, Larry Jones wrote: > > There are many spurious hunks due to the usage of $Id$, $Log$, etc. Is > > there an easy way to generate a diff without these hunks? > > -kk Thanks :) ! With kind regards, Baurzhan. ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
Re: CVS Merge between branches in two different repositories
Baurzhan Ismagulov writes: > > There are many spurious hunks due to the usage of $Id$, $Log$, etc. Is > there an easy way to generate a diff without these hunks? -kk -Larry Jones I can do that! It's a free country! I've got my rights! -- Calvin ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
Re: CVS Merge between branches in two different repositories
On Wed, Feb 23, 2005 at 11:03:03AM -0500, Larry Jones wrote: > No, CVS has no way to know what the relationship is between things in > different repositories. You could use ``cvs diff'' to get the changes > from the one repository and then use ``patch'' to apply them to a > working directory from the other repository. There are many spurious hunks due to the usage of $Id$, $Log$, etc. Is there an easy way to generate a diff without these hunks? With kind regards, Baurzhan. ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
Re: CVS Merge between branches in two different repositories
Muk writes: > > I have two different repositories ( basically two trunks ) for the > same project. There are branches on both. I would like to merge branch > A on trunk 1 with branch B on trunk 2. Is this possible with cvs merge? No, CVS has no way to know what the relationship is between things in different repositories. You could use ``cvs diff'' to get the changes from the one repository and then use ``patch'' to apply them to a working directory from the other repository. -Larry Jones Hey! What's the matter? Can't you take a joke?! It was a JOKE! -- Calvin ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
CVS Merge between branches in two different repositories
Folks, I have two different repositories ( basically two trunks ) for the same project. There are branches on both. I would like to merge branch A on trunk 1 with branch B on trunk 2. Is this possible with cvs merge? I tried to do this - > with trunk 2 as CVSROOT, cvs co -r B . with trunk 1 as CVSROOT, cvs update -j A with trunk 2 as CVSROOT, cvs diff -r B I got a lot of messages saying the comparison is not possible. When I did a CVS status on files in the working directory, the working revision had been changed to "New File!". Please advise if there is a way to merge the two branches in two different trunks. Thanks, Mukund ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
RE: CVS merge conflict
this may suit your needs - just runs against a single file. you can drive it from 'find ... exec' if you have a bunch of files and a single revision tag... hth Dave -Original Message- From: Erik Andersson [mailto:[EMAIL PROTECTED] Sent: Tuesday, October 26, 2004 2:15 PM To: [EMAIL PROTECTED] Subject: CVS merge conflict Hi Anyone know of a script that can resolve conflicts (or any other nice unix tool). Lets say you know that you should use all from one version of the file and not the other. That should be quite easy to fix a script for. (But I'm too tired now and need to hit the bed.) I really don't want to do this manually. Please help me out ;-) Best Regards / Erik ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs stickyCheat.pl Description: Binary data ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
CVS merge conflict
Hi Anyone know of a script that can resolve conflicts (or any other nice unix tool). Lets say you know that you should use all from one version of the file and not the other. That should be quite easy to fix a script for. (But I'm too tired now and need to hit the bed.) I really don't want to do this manually. Please help me out ;-) Best Regards / Erik ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
RE: Cvs merge problem
Ramanuj, If you are using TortoiseCVS on the client then you are probably using CVSNT. http://www.cvsnt.com However on Linux you may be using either CVS or CVSNT (CVSNT is also GNU/GPL and runs on Linux/Windows/Mac/Unix etc). Your description of the problem is a little difficult to follow. Could you please post again with version numbers and code snippets and the command lines used for merging. This will make it much easier to understand and ultimately help. Regards, Arthur Barrett -Original Message- From: [EMAIL PROTECTED] on behalf of Ramanuj Singh Sent: Thu 8/19/2004 4:46 PM To: '[EMAIL PROTECTED]' Cc: Subject: Cvs merge problem Hi, I m facing very strange problem.Developers are working on their branch made from a development branch on trunk. 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 show changes but these files are do not show any changes. Apart from these kind of files, rest of the files merge successfully. This problem is creating a great hindrance the development of the project.They are using tortoise CVS as for this CVS stuff. I checked these merging on command prompt in linux, I m also facing same problem with this project. Help me out. Thanks in Advance. Regards, Ramanuj Singh The information transmitted is intended only for the person or entity to whom it is addressed and may contain confidential and / or privileged Material. Any review, re-transmission, dissemination or other use of or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from your computer. Thank you for your understanding & co-operation. ___ 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
Cvs merge problem
Title: Cvs merge problem Hi, I m facing very strange problem.Developers are working on their branch made from a development branch on trunk. 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 show changes but these files are do not show any changes. Apart from these kind of files, rest of the files merge successfully. This problem is creating a great hindrance the development of the project.They are using tortoise CVS as for this CVS stuff. I checked these merging on command prompt in linux, I m also facing same problem with this project. Help me out. Thanks in Advance. Regards, Ramanuj Singh The information transmitted is intended only for the person or entity to whom it is addressed and may contain confidential and / or privileged Material. Any review, re-transmission, dissemination or other use of or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from your computer. Thank you for your understanding & co-operation. ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: CVS merge
I think the problem is the start and end points of your merge. If I have a trunk, and I created a branch from that trunk, tagging it at the point it was created, I would use the following to merge the branch back into the trunk: -j branch_CREATED -j branch Often this can simply be abbreviated as -j branch If you are doing something more complicated than this, please tell us the structure of the branches involved. There are additional details on this subtle and complex feature here, in the manual under the "Branching and Merging" section: http://www.cvshome.org/docs/manual/cvs-1.11.7/cvs_5.html#SEC54 I advise you to read it carefully, or you will get into trouble. [EMAIL PROTECTED] wrote on 11/11/2003 09:23:19 PM: > Hi, > > I don't think my following merge result is correct. I > did a merge in branch1 to join branch2 as following > command: > > branch1$ cvs -q update -Pd -kk -j branch1 -j branch2 > > There is only one file shown me the conflicts by > "<<" and ">>" comments embedded in the file. > Many other files in branch1 are simply replaced by > branch2 source files and created .#file1.h.1.2.3, > .#file2.c.1.2.5 > > For example, the file1.h in branch1 includes three > functions A(), B() and C(). The file1.h in branch2 has > only two functions A() and B(). I expected that the > merged new file would include A(), B() and C(), but to > be surprised, the new merged file has only A() and > B(), same as branch2 source file. The function C() was > simply lost. Is this normal behavior or am I missing > something here? > > (CVS version 1.10 for Window, I guess, it is > irrelevant) > > Thank you. > > yh > > > > __ > Do you Yahoo!? > Protect your identity with Yahoo! Mail AddressGuard > http://antispam.yahoo.com/whatsnewfree > > > ___ > 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 merge
Hi, I don't think my following merge result is correct. I did a merge in branch1 to join branch2 as following command: branch1$ cvs -q update -Pd -kk -j branch1 -j branch2 There is only one file shown me the conflicts by "<<" and ">>" comments embedded in the file. Many other files in branch1 are simply replaced by branch2 source files and created .#file1.h.1.2.3, .#file2.c.1.2.5 For example, the file1.h in branch1 includes three functions A(), B() and C(). The file1.h in branch2 has only two functions A() and B(). I expected that the merged new file would include A(), B() and C(), but to be surprised, the new merged file has only A() and B(), same as branch2 source file. The function C() was simply lost. Is this normal behavior or am I missing something here? (CVS version 1.10 for Window, I guess, it is irrelevant) Thank you. yh __ Do you Yahoo!? Protect your identity with Yahoo! Mail AddressGuard http://antispam.yahoo.com/whatsnewfree ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: CVS Merge Issue
On Tue, 11 Nov 2003 16:40:13 -0500, Patwardhan, Rajesh wrote > Hello All, > > A file was added on a branch, and now I am unable to add it on the > trunk or on any other branch. > Just merge it like you would any other changes you made on the branch: http://www.cvshome.org/docs/manual/cvs-1.11.6/cvs_5.html#SEC60 Regards, Geoff ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
CVS Merge Issue
Hello All, A file was added on a branch, and now I am unable to add it on the trunk or on any other branch. Could some one please help. Thankyou very much in advance for the help. Regards, Rajesh I am sorry if this is a repeat question and has been addressed before, if yes Please point me to the appropriate location , I did do a search and did not find relevant information on the google groups. Error; cvs add: file1 has already been entered cvs log file1 file file1 was initially added on branch NEW_BRANCH. cvs is in local mode, on Solaris, cvs -v Concurrent Versions System (CVS) 1.11 (client/server) Copyright (c) 1989-2000 Brian Berliner, david d `zoo' zuhn, Jeff Polk, and other authors CVS may be copied only under the terms of the GNU General Public License, a copy of which can be found with the CVS distribution kit. Specify the --help option for further information about CVS ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: CVS Merge Help....File added on both Trunk and Branch
On Fri, Mar 15, 2002 at 08:44:32AM -0800, Patrick Burleson wrote: > Hello all, > I have the problem where a file was added both on a Trunk and a > branch and CVS is giving me the "foo.c exists, but has been added in > revision BAR" error message when I try to do a merge. I have read many > posts about this subject, but the answer was always what causes this > message, not how to fix it. I need to get the revision on the branch > into the Trunk as it is the correct one. How do I go about doing this? Not sure if this is the standard approach, but it might work to "cvs rm" the file on the trunk, commit, then retry the merge. -- | | /\ |-_|/ > Eric Siegerman, Toronto, Ont.[EMAIL PROTECTED] | | / "Outlook not so good." That magic 8-ball knows everything! I'll ask about Exchange Server next. - Anonymous ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
CVS Merge Help....File added on both Trunk and Branch
Hello all, I have the problem where a file was added both on a Trunk and a branch and CVS is giving me the "foo.c exists, but has been added in revision BAR" error message when I try to do a merge. I have read many posts about this subject, but the answer was always what causes this message, not how to fix it. I need to get the revision on the branch into the Trunk as it is the correct one. How do I go about doing this? Thanks, Patrick ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
CVS MERGE PROBLEMS.
Hello all, I encountered this MERGING problem in CVS. After BranchA was off from MAIN trunk, people created new files as well new directories in BRANCHA but not in main. When I issued the merge, CVS successfully added the new files in existing directories of BRANCHA but failed to add new directories and files in BRANCHA. cvs -q update -j LASTMERGE -J TMP_MERGE_TAG module (TMP_MERGE_TAG simply pointed to the tip of BRANCHA) And people checked some files both into MAIN and BRANCHA, and made changes on BRANCHA, but CVS refused to merge the changes. cvs server: file resource/js/homepage.js exists, but has been added in revision TMP_MERGE_TAG cvs server: file resource/js/rollover.js exists, but has been added in revision TMP_MERGE_TAG Thanks for any input. cheers George ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: cvs merge crash !!
"Zanabria, Moises" <[EMAIL PROTECTED]> writes: >That does mean that is no way to check a merge before I really want to >merge?? Yes there is. The merge isn't really over until you commit the result. The entire process looks like this: 1) Check out a *clean* copy from the tip of the trunk. After the check-out, all the files in the local copy have a status of "up to date". 2) Do the merge, with "cvs update -jbranch_start -jbranch_end" . This changes some of the files in the local copy, they now have a status of "locally modified". Some of them have conflict markers and some don't; nevertheless, they all appear as "locally modified" *as if you had made the changes manually*. 3) You fix the conflicts, if any, and make sure everything works. Nothing is permanent yet, you still have a local copy with locally modified files. The go/no-go decision comes at the next step. 4a) You commit the result. The changes go in the repository and the local copy appears "up to date" again. 4b) You give up and delete the local copy. It's as if nothing had ever happened. You can combine steps (1) and (2). No matter. The result of a merge is a sandbox with locally modified files. The fact that most of the modifications were done by CVS is immaterial. -- Pierre Asselin Westminster, Colorado -= Posted via Newsfeeds.Com, Uncensored Usenet News =- http://www.newsfeeds.com - The #1 Newsgroup Service in the World! -== Over 80,000 Newsgroups - 16 Different Servers! =- ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: cvs merge crash !!
In article <[EMAIL PROTECTED]>, Zanabria, Moises wrote: >That does mean that is no way to check a merge before I really want to >merge?? A merge operation does nothing to the repository; all it does is edit your local files. A separate commit step is necessary to put the results of the merge into the repository, after any conflicts are resolved and it is verified that the results are sane. If you want to be able to check a merge, make sure you have no other outstanding changes, that your working copy is up to date with no local modifications. That way when you merge, the changes from the merge won't be conflated with any other outstanding changes. If you decide not to do the merge, you can just throw away all local modifications. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: cvs merge crash !!
That does mean that is no way to check a merge before I really want to merge?? Moises -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]] Sent: Thursday, December 20, 2001 3:17 PM To: [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] Subject: Re: cvs merge crash !! Zanabria, Moises writes: > > cvs -n update -l -jXXX > RCS file: /cvsroot/migration/makefile,v > retrieving revision 1.2 > retrieving revision 1.2.2.1 > Merging differences between 1.2 and 1.2.2.1 into makefile > cvs server: makefile: No such file or directory What are you trying to do? The -n global option says not to actually modify any files, so the client doesn't bother sending the file to the server, which is why the server can't find it. -Larry Jones I hate it when they look at me that way. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: cvs merge crash !!
Zanabria, Moises writes: > > cvs -n update -l -jXXX > RCS file: /cvsroot/migration/makefile,v > retrieving revision 1.2 > retrieving revision 1.2.2.1 > Merging differences between 1.2 and 1.2.2.1 into makefile > cvs server: makefile: No such file or directory What are you trying to do? The -n global option says not to actually modify any files, so the client doesn't bother sending the file to the server, which is why the server can't find it. -Larry Jones I hate it when they look at me that way. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
cvs merge crash !!
Hi Guys : I'm try to run the following command: cvs -n update -l -jXXX RCS file: /cvsroot/migration/makefile,v retrieving revision 1.2 retrieving revision 1.2.2.1 Merging differences between 1.2 and 1.2.2.1 into makefile cvs server: makefile: No such file or directory so I was tried: cvs -n update -jJJJ -jXXX RCS file: /cvsroot/migration/makefile,v retrieving revision 1.2 retrieving revision 1.2.2.1 Merging differences between 1.2 and 1.2.2.1 into makefile cvs server: makefile: No such file or directory Do I making something wrong ? BTW. I have version 1.10 in server and 1.11 for client Please advise. Thanks Moises. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
CVS: merge problem?
[EMAIL PROTECTED] writes: > Problem: > > A file from the trunk had lines of code removed. > > After doing the sync, I had expected to see the lines of code move in the > target file but they stayed put. > > Based upon my simple understanding of how the merge works can anyone > explain what may have happened? cvs-1.11 and earlier versions had a bug which can cause this. cvs-1.11.1 and later versions have a fix for it. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
CVS: merge problem?
All - I've encountered a problem when trying to merge a trunk revision of a file into a branch revision. Below is the background and description of the problem. Background: It has been my understanding that CVS will merge according to the following basic rules... 1. When code has been added to the source file, it will also be added to the destination file 2. When code has been removed from the source file, it will be removed from the target file 3. When the same line of code has changed in the target file it will be flagged as a conflict Problem: A file from the trunk had lines of code removed. After doing the sync, I had expected to see the lines of code move in the target file but they stayed put. Based upon my simple understanding of how the merge works can anyone explain what may have happened? Dave Garrison Voice: (716) 214-1941 Fax: (716) 295-9157 Element K 'the knowledge catalyst' www.elementk.com ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: CVS Merge problem - will not merge in new code
John Mocyk wrote: > When does CVS consider a new file not new any more? A few of these files have been > modified and I would have thought they would have not been considered new anymore. A file is new _within a workspace_ if the file was not checked out by CVS, but created and 'cvs add'ed, and until a successful commit. Derek -- Derek Price CVS Solutions Architect ( http://CVSHome.org ) mailto:[EMAIL PROTECTED] OpenAvenue ( http://OpenAvenue.com ) -- Needing someone is like needing a parachute. If he isn't there the time you need him, chances are you won't be needing him again. - Scott Adam's _Dilbert_ ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: CVS Merge problem - will not merge in new code
When does CVS consider a new file not new any more? A few of these files have been modified and I would have thought they would have not been considered new anymore. I have about 137 files that give me this message and they where all new files that have been created in the last 3 months. The files only reside on the branches and tags but not on the MAIN trunk. I guess I need to move all these files to the main trunk and do this for any new files that are created in the future on my main branch.. The joy's of learning Thank You John "Derek R. Price" wrote: > John Mocyk wrote: > > > I get this message when I am trying to update a branch (same message > > if from a static tag or branch) and it seems to occur with some of the > > new files. > > The branch is just a project that is being worked on and the statictag > > is a tag of what was released into production and is code at > > production level. > > > > eg. > > > > cvs co -r branch1 cvs server: file > > pin60/setup/scripts/service_um.pod exists, but has been > > added in revision production > > cvs update -j production -Pd cvs server: file > > pin60/setup/scripts/service_um.pod > > > > cvs server: file pin60/setup/scripts/service_um.pod > > exists, but has been added in revision production > > > > This will occur on trying to merge in the changes from > > another branch as well. > > The file was created between the creation of branch1 and > > statictag. > > > > > > What happen's is that any changes that I want bring in will not update > > the code on the branch. > > If I understand your problem correctly, then that is intentional. CVS > sees new files on each branch and has no idea how to procedd with the > merge. It is expecting you to look at both versions and decide which is > the keeper or merge them youself. > > Derek > > -- > Derek Price CVS Solutions Architect ( http://CVSHome.org ) > mailto:[EMAIL PROTECTED] OpenAvenue ( http://OpenAvenue.com ) > -- > I heard a lot of stories in my time. They went along with the sound of the > tinny piano playing in the parlor downstairs. > > - Humphrey Bogart as Rick, _Casablanca_ > > ___ > Info-cvs mailing list > [EMAIL PROTECTED] > http://mail.gnu.org/mailman/listinfo/info-cvs begin:vcard n:Mocyk;John tel;fax:(604)482-5722 tel;work:(604)482-5742 x-mozilla-html:FALSE org:Telus Advanced Communications;Internet Services adr:;;4 -- 4595 Canada Way;Burnaby;BC;V5G 1J9;Canada version:2.1 email;internet:[EMAIL PROTECTED] title:Release Manager fn:John Mocyk end:vcard
Re: CVS Merge problem - will not merge in new code
John Mocyk wrote: > I get this message when I am trying to update a branch (same message > if from a static tag or branch) and it seems to occur with some of the > new files. > The branch is just a project that is being worked on and the statictag > is a tag of what was released into production and is code at > production level. > > eg. > > cvs co -r branch1 cvs server: file > pin60/setup/scripts/service_um.pod exists, but has been > added in revision production > cvs update -j production -Pd cvs server: file > pin60/setup/scripts/service_um.pod > > cvs server: file pin60/setup/scripts/service_um.pod > exists, but has been added in revision production > > This will occur on trying to merge in the changes from > another branch as well. > The file was created between the creation of branch1 and > statictag. > > > What happen's is that any changes that I want bring in will not update > the code on the branch. If I understand your problem correctly, then that is intentional. CVS sees new files on each branch and has no idea how to procedd with the merge. It is expecting you to look at both versions and decide which is the keeper or merge them youself. Derek -- Derek Price CVS Solutions Architect ( http://CVSHome.org ) mailto:[EMAIL PROTECTED] OpenAvenue ( http://OpenAvenue.com ) -- I heard a lot of stories in my time. They went along with the sound of the tinny piano playing in the parlor downstairs. - Humphrey Bogart as Rick, _Casablanca_ ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
CVS Merge problem - will not merge in new code
I get this message when I am trying to update a branch (same message if from a static tag or branch) and it seems to occur with some of the new files. The branch is just a project that is being worked on and the statictag is a tag of what was released into production and is code at production level. eg. cvs co -r branch1 cvs server: file pin60/setup/scripts/service_um.pod exists, but has been added in revision production cvs update -j production -Pd cvs server: file pin60/setup/scripts/service_um.pod cvs server: file pin60/setup/scripts/service_um.pod exists, but has been added in revision production This will occur on trying to merge in the changes from another branch as well. The file was created between the creation of branch1 and statictag. What happen's is that any changes that I want bring in will not update the code on the branch. begin:vcard n:Mocyk;John tel;fax:(604)482-5722 tel;work:(604)482-5742 x-mozilla-html:FALSE org:Telus Advanced Communications;Internet Services adr:;;4 -- 4595 Canada Way;Burnaby;BC;V5G 1J9;Canada version:2.1 email;internet:[EMAIL PROTECTED] title:Release Manager fn:John Mocyk end:vcard
Re: cvs merge
On Wed, Dec 06, 2000 at 02:08:23PM -0600, Brett Neumeier wrote: > Yes; that would be more accurate. Changes are not being lost; they > are just being removed from the head revision. But how soon will you notice this? This should definitely be the exception, not the rule. If this is happening more often than, say, once a quarter or so, you probably need to look at your process. Someone is probably doing things they shouldn't be doing. mrc -- Mike Castle Life is like a clock: You can work constantly [EMAIL PROTECTED] and be right all the time, or not work at all www.netcom.com/~dalgoda/ and be right at least twice a day. -- mrc We are all of us living in the shadow of Manhattan. -- Watchmen ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: cvs merge
Lan Barnes wrote: > Mike Castle wrote: > > If you need to commit and others have changed the file too, and you are > > certain, VERY VERY CERTAIN that you don't want those changes, then rename > > your file, cvs update, copy your renamed file over the file just checked > > out, then commit. THIS WILL LOSE CHANGES! > > Clarification requested: Would it be more accurate to say that > the changes would no longer be reflected in the tip of the trunk, > but would still be available in the previous revision? Serious > question -- I want to be sure I understand this. Yes; that would be more accurate. Changes are not being lost; they are just being removed from the head revision. -bn ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: cvs merge
Mike Castle wrote: > -snip- > If you need to commit and others have changed the file too, and you are > certain, VERY VERY CERTAIN that you don't want those changes, then rename > your file, cvs update, copy your renamed file over the file just checked > out, then commit. THIS WILL LOSE CHANGES! Clarification requested: Would it be more accurate to say that the changes would no longer be reflected in the tip of the trunk, but would still be available in the previous revision? Serious question -- I want to be sure I understand this. TIA -- Lan Barnes [EMAIL PROTECTED] Icon Consulting, Inc 858-273-6677 The statesman's task is to hear God's footsteps marching through history, and to try to catch on to His coattails as He goes marching past. - Otto von Bismarck ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: cvs merge
On Wed, Dec 06, 2000 at 11:16:09AM -0500, Largent, Jim wrote: > Is there any way to stop CVS from always trying to merge your code? Why would you want to do that? (serious question, what are you trying to accomplish?) I can think of two things: You don't want to keep your changes. You don't want to see other's changes. First is easy, delete the file then do cvs update. Second is a bit more complicated, but basically comes down to: don't do a cvs update. (You could, for instance, do cvs -n up, then manually update files that you do want to see changes for). If you need to commit and others have changed the file too, and you are certain, VERY VERY CERTAIN that you don't want those changes, then rename your file, cvs update, copy your renamed file over the file just checked out, then commit. THIS WILL LOSE CHANGES! mrc -- Mike Castle Life is like a clock: You can work constantly [EMAIL PROTECTED] and be right all the time, or not work at all www.netcom.com/~dalgoda/ and be right at least twice a day. -- mrc We are all of us living in the shadow of Manhattan. -- Watchmen ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
cvs merge
Is there any way to stop CVS from always trying to merge your code? ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: CVS Merge Algorithm
AFAIK, CVS uses diff3. For example, when merging two versions, it just: ( diff3 -E to_version ancestor from_version; echo w; echo q; ) | ed - to_version I may have gotten some details mixed up, so experiment. Noel [EMAIL PROTECTED] on 2000.10.13 19:14:08 To: [EMAIL PROTECTED] cc: (bcc: Noel L Yap) Subject: CVS Merge Algorithm Hey all..I'm sure this is in a FAQ somewhere because I thought I saw it once. I'm trying to enlighten my team about the ways of CVS and when I said it can automatically merge code alarm bells went off all around. I'm sure many of you have been through this before ;-) Is there a whitepaper on the CVS merge algorithm and a statistics page about false positives and error percentages when using the automatic merge? Thanks, Chris -- Chris Hirsch http://www.Tecomac.com [EMAIL PROTECTED] What? Me Worry? Linux Inside _. _ __.. .__ .. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs This communication is for informational purposes only. It is not intended as an offer or solicitation for the purchase or sale of any financial instrument or as an official confirmation of any transaction. All market prices, data and other information are not warranted as to completeness or accuracy and are subject to change without notice. Any comments or statements made herein do not necessarily reflect those of J.P. Morgan & Co. Incorporated, its subsidiaries and affiliates. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
CVS Merge Algorithm
Hey all..I'm sure this is in a FAQ somewhere because I thought I saw it once. I'm trying to enlighten my team about the ways of CVS and when I said it can automatically merge code alarm bells went off all around. I'm sure many of you have been through this before ;-) Is there a whitepaper on the CVS merge algorithm and a statistics page about false positives and error percentages when using the automatic merge? Thanks, Chris -- Chris Hirsch http://www.Tecomac.com [EMAIL PROTECTED] What? Me Worry? Linux Inside _. _ __.. .__ .. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
