[cvsnt] CVS -- what way can this happen ?
bo.berglund at telia.com
Thu Sep 25 07:20:02 BST 2008
On Thu, 25 Sep 2008 11:13:29 +0530, <anilal.gopinathan at wipro.com>
>I saw one issue with CVS. Could any one suggest what could be the
>One user (user A) did some modification to one of the file and committed
>User B took the update and modified the same file and committed.
>But the change did by User A was not reflected in the latest file? (It
>did not shown any Conflict either)
>How can this happen?
>1. If the user B replaced the content entirely (by moving to a temp file
>then did the modification and pasted back) and committed back to CVS.(it
>won't throw conflict)
>Apart from the #1 marked above, is there any way to get this error?
After user B has updated the file from CVS he has now the changes made
by user B in his local modified file. He can now do whatever he likes
with the file, for example remove the changes made by user A and then
Now the user A changes will be gone. But it depends on what user B
Conflicts are only shown during *update* and they will happen only if
you update a file you have started editing when the other user has
also edited this file in approximately the same area as you have and
then committed his edit.
In all other cases there will *not* be a conflict.
(Bo Berglund, developer in Sweden)
More information about the cvsnt