[Top][All Lists]

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

Re: Working on sources in parallel

From: Paul Sander
Subject: Re: Working on sources in parallel
Date: Wed, 15 Jun 2005 22:56:04 -0700

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.

On Jun 15, 2005, at 10:44 PM, address@hidden wrote:

I have another question.

Let's stick to the scenario Christopher made up. Say person1 thinks it'd be a good idea to remove some helper-function foo(), and replace it with another function bar(). Then he commits the sources. Person2 still works on the outdated source, where foo() exists, and he thinks it'd be a good idea to introduce a new variable or whatever in foo(), so his changes to the file are limited to the function foo. Now he wants to commit his changes, and CVS complains "sorry bro, update first". Okay, so he does an update, and... now what? What does CVS do in such a situation? How could it merge the two sources, with changes to a function foo() which was removed by person1?

So many questions :)

Matthias Kaeppler
Info-cvs mailing list

Paul Sander | "Lets stick to the new mistakes and get rid of the old
address@hidden | ones" -- William Brown

reply via email to

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