Re: CVS Stuff - Was: [ jEdit-users ] Abbreviations

[mike d. <md...@je...>]

begin Martin Fischbach quotation:
> - Say, I have changed some lines in a file (working copy), but meanwhile 
> that file was modified by someone else! I use update to get the new version 
> and then diff, to see what changed? What happens to my local working copy 
> then? Is it replaced, or does the CVS client keep different versions of 
> that file?

Alex did an excellent job of answering all your questions, but I'd just
like to emphasize a point he made (and that I had tried to make).

Normally, CVS will be able to automatically merge other people's changes
into your working copy when you do a "cvs update", so long as you aren't
working on the same part of the file. If you have been working on the
same part of the file, CVS has no way to know which version is correct,
so it punts and says there's a "conflict". You'll have to manually
resolve the conflict by editing the part of the file that looks like
this:

	<<<<<<< $FILE
	   ... Changes in the local copy
	=======
	   ... Changes in the latest repository version
	>>>>>>> $IN_HEAD_REVISION

To resolve this, you need to decide which lines really should be between
the "<<<<<<<" and ">>>>>>>", then edit the file down to those lines. It
could be one of the two sets of lines or a combination of the two.

-md