[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

I need help in understanding this...

From: Bob Fyfe
Subject: I need help in understanding this...
Date: Thu, 22 Sep 2005 11:40:58 -0400

Could someone help me understand how I might see the following:

I have a project called 'foox' Two days ago (9/20/05), I am in a checked out sandbox and issue the following command:

%cvs -n -q upd
M build.xml
M jsp/file1.jsp
A jsp/file2.jsp
M jsp/file3.jsp
M servlets/

To me that means four files have been modified in the sanbox from what the respository knows about as well as one other file being added but none of these changes having been committed.

Today (9/22/05), I am in the same checked out sandbox, not having issued any cvs commands to this project that would change the project, and issue the same command with the following results:

%cvs -n -q upd
M build.xml
M jsp/file1.jsp
cvs update:  conflict: jsp/file2 created independently by second party
C jsp/file2.jsp
M jsp/file3.jsp
M servlets/

So generally I know that there is a conflict. I also know another person touched this project from another sandbox. They tell me, "Yes, I checked it in to CVS." I'm not certain what they did. What is particularly confusing to me is that when I do a status and log commands on the file - noting dates - I get the following:

%cvs status jsp/file2.jsp
cvs status: conflict: jsp/file2.jsp created independently by second party
File: file2.jsp       Status: Unresolved Conflict

   Working revision:    New file!
   Repository revision: 1.1     /home/cvs/foox/jsp/file2.jsp,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

intranet4 672 => cvs log jsp/file2.jsp

RCS file: /home/cvs/foox/jsp/file2.jsp,v
Working file: jsp/file2.jsp
head: 1.1
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 1;     selected revisions: 1
revision 1.1
date: 2005/09/15 15:42:14;  author: mypal;  state: Exp;
Initial checkin
intranet4 673 =>

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?

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?

Thanks for any help you can give.


*Bob Fyfe,      KG8FU,  NREMT-P "A King's Kid" John 1.12      *
*Phone:        (419) 372-2103                                           *
*Internet:      address@hidden                                  *
*U.S.Post: c/o Information Technology Services *
*                Rm.254 Hayes, BGSU                                     *
*                Bowling Green, OH 43403                                *

reply via email to

[Prev in Thread] Current Thread [Next in Thread]