Re: I need help in understanding this...

[Mark E. Hamilton]

Bob Fyfe wrote:

> I really have two questions:
>
> 1.  This other person said he did this last week and the log command 
> seems to reflect that. Why would I have seen something different from my 
> sandbox two days ago than today?

This one I can't answer. Since the file seems to have been added to the 
repository on 9/15, your update command of 9/20 should have shown the 
same conflict as it did on 9/22.

> 2.  What did this other person actually do? Did they somehow create a 
> new entry over the current
>      one or use an import command or what?

What the other person did was

cvs add jsp/file2.jsp
cvs commit

Remember that until you do a 'cvs commit' none of your added files are 
in the repository, nor is there any indication in the repository that 
you (or the other preson, for that matter) has added it. So, conceivably 
 many other users could have added the file; the first one to commit it 
is the winner, and everyone else gets to resolve the conflicts.

The way I would resolve this in your project would be to do a

mv jsp/file2.jsp jsp/file2.jsp.bck
cvs remove jsp/file2.jsp
cvs checkout jsp/file2.jsp

Then you can restore your changes to the file, if necessary, and commit it.

--
----------------
Mark E. Hamilton
Orion International Technologies, Inc.
Sandia National Laboratory, NM.
505-844-7666