Re: cvs update not pulling in changes

[David Carson]

lawrence.jones@ugsplm.com (Larry Jones) wrote in message 
news:<mailman.1985.1091067998.1960.bug-cvs@gnu.org>...
> 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.
> 

No, I don't think so.  Bob showed me the output of his update command,
which was simply "M helper.c".  It did not give the normal "retrieving
revision 1.2.2.3; retrieving revision 1.2.2.4; merging differences..."
message.   This is why the episode has me so confused.

> 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
> 

Don't you mean '-j' instead of '-r' there?  Yes, we did that in the
end to force the changes into his file.  It worked, but still does not
explain why the first update did not do the implicit merge.