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
[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
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 t
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 branc
/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
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
lev
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 a
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 file
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
