[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: Cvs merge problem
RE: Cvs merge problem
Thu, 19 Aug 2004 17:15:29 +1000
If you are using TortoiseCVS on the client then you are probably using CVSNT.
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.
From: address@hidden on behalf of Ramanuj Singh
Sent: Thu 8/19/2004 4:46 PM
Subject: Cvs merge problem
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.
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.
- Cvs merge problem, Ramanuj Singh, 2004/08/19
- RE: Cvs merge problem,
Arthur Barrett <=