Re: merge issues

[Larry Jones]

address@hidden writes:
> 
> We are using CVS version 1.10 running on Solaris 2.8.

You may want to consider upgrading to the current release (1.11.1p1, or
at least 1.11), which you can get from www.cvshome.org.

> A 'problem' occured when CVS merged a file multiple users had checked out and
> altered.
> All effected lines were in the original version in the repository.
> Issue 1:
> User 1 changed line 1 in the file.
> User 2 changed last line in the file.
> No confliclited text changes were flagged.
> Merged file contained:
>      User 1's line change (overwrote User 2's information)
>      User 2's line change (overwrote User1's information)

Huh?  If user 1 only changed the first line in the file and user 2 only
changed the last line in the file, how can their changes have
overwritten each other?  It sounds like you don't understand how CVS
works:  User 1 and user 2 should each have separate working directories
that are checked out from CVS.  They both make their changes.  They then
commit their changes into CVS.  Whoever does the commit first updates
the file in CVS.  The second person to try to commit gets an error
indicating that their working file is out of date.  They then do an
update which merges the other person's changes into their working file. 
They're then supposed to verify the merged changes and then commit the
file to CVS.  At that point, the first person's working file is out of
date and needs to be updated, which they should do at some point in the
future.

By far the most common source of merge problems is people who do an
update while they have files open in an editor and then exit the editor
saving their old version of the file over top of the merged version from
the update.

-Larry Jones

Why can't I ever build character in a Miami condo or a casino somewhere?
-- Calvin