Re: Cvs merge problem

2004-08-19 Thread Rohan Nandode
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

RE: Cvs merge problem

2004-08-19 Thread Arthur Barrett
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.

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