[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: CVSs How do they it work?

From: Todd Denniston
Subject: Re: CVSs How do they it work?
Date: Fri, 03 Feb 2006 09:00:09 -0500
User-agent: Mozilla Thunderbird 1.0.7-1.1.fc4 (X11/20050929)

Robin wrote:
If N developers alter the same file, what happens when they try to save
them back to the Server?


The manual[1] has advice on this.
the simplified answers are... First CVS attempts to merge the changes for the developer, and they get one of the following results: a) if the developers are working significantly different lines (one is at lines 1-20, another is working 30-50, and the third is working 75-90), then each will be able to do simple update and commit operations as if they were the only one working on the file (also assuming they are making changes that are logically consistent as well).

b) if the developers happen to be working on the same lines, or lines very close to one another, they will get conflicts[2] which are marked by cvs so that the second developer will know there are some lines he/she will have to merge by hand before cvs will allow the commit to occur (cvs will refuse to commit a file with conflict markers unless you update the timestamps on the file).

When you have a file that will often be worked on by many developers, it is often a good thing to have cvs notify all the interested developers by using action watches, i.e., `cvs watch add -a commit filename`

Todd Denniston
Crane Division, Naval Surface Warfare Center (NSWC Crane)
Harnessing the Power of Technology for the Warfighter

reply via email to

[Prev in Thread] Current Thread [Next in Thread]