[Top][All Lists]

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

Re: Working on sources in parallel

From: Jim Hyslop
Subject: Re: Working on sources in parallel
Date: Thu, 16 Jun 2005 09:24:07 -0400
User-agent: Mozilla Thunderbird 1.0.2 (Windows/20050317)

Paul Sander wrote:
CVS notices the conflicting changes and produces a working copy of the file that contains Person1's removed lines and Person2's inserted lines, with special mark-ups to draw attention to the problem. It also leaves copies of both contributors in the user's workspace.

Not quite. CVS will only rename your working copy to .#[filename].[cvs revision]. To see the other person's contributions you need to use 'cvs diff' on the pre- and post-modification revisions.


reply via email to

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