Re: cvs update not pulling in changes

[Larry Jones]

David Carson writes:
> 
> - Bob has version 1.2.2.3 of helper.c in his working copy.  He
> modifies it and is preparing to check it in.
> - Joe also has 1.2.2.3, modifies and commits before Bob has a chance.
> - Bob does a 'cvs update' (using WinCvs), which tells him that he has
> a modified copy of helper.c.  However:
>  . it does not pull in the _changes_ from Joe
>  . it _does_ update the version to 1.2.2.4

According to my crystal ball, the reason for this is that Bob had the
file open in his favorite text editor when he did the update.  Some time
later, Bob saved the file from the editor, replacing the merged copy
that CVS had created with his original version without any of Joe's
changes.

You should be able to recover by having Bob redo the merge manually:

        cvs up -r1.2.2.3 -r1.2.2.4 helper.c

However, some versions of CVS "know" that helper.c should already
contain those changes and so don't do anything for that command.  In
that case you can use cvs diff and patch:

        cvs diff -r1.2.2.3 -r1.2.2.4 helper.c | patch

-Larry Jones

Girls are like slugs -- they probably serve some purpose, but
it's hard to imagine what. -- Calvin