RE: cvs update not pulling in changes

[Jim.Hyslop]

lawrence.jones@ugsplm.com wrote:
> 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.
That sounds like the most likely cause.

> 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

Shouldn't those flags be -j, not -r?

-- 
Jim Hyslop
Senior Software Designer
Leitch Technology International Inc. (http://www.leitch.com)
Columnist, C/C++ Users Journal (http://www.cuj.com/experts)