Re: CVS Merge problem - will not merge in new code

2001-02-15 Thread John Mocyk
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

Re: CVS Merge problem - will not merge in new code

2001-02-15 Thread Derek R. Price
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

CVS Merge problem - will not merge in new code

2001-02-14 Thread John Mocyk
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