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