[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Mysterious Conflict
From: |
Arachtingi, Mike |
Subject: |
Mysterious Conflict |
Date: |
Mon, 25 Aug 2003 10:46:10 -0500 |
Greetings all,
I'm perplexed by the report of a conflict in a file.
I've checked out my entire tree, sticky on a module tag (build-2_4_0.)
When I then query status, it shows that one file (out of about 800 files
in 500 folders) is not up-to-date. When I try to update it (keeping the
sticky tag) CVS indicates that a conflict is preventing update of that
file.
So, I deleted the file, and updated that folder. The file was restored,
but the anomaly appears again: the output of query update shows that
this file needs updating, but the update command complains of a
conflict.
I've appended the console output, and some log info of the file in
question. Can anyone shed some light on this mystery for me?
Many thanks,
Mike A.
--------> I just did an update. Then I follow it with a
query update,
--------> which shows that one java file needs to be
updated:
cvs -n update -P (in directory C:\nn\expedience-2.4.0\expedience\)
cvs server: Updating .
cvs server: Updating APweb
cvs server: Updating APweb/WEB-INF
... [Bunch of lines deleted]
cvs server: Updating com/nextnetwireless/exp/message/basemessages
... [Bunch of lines deleted]
cvs server: Updating web/WEB-INF/lib
U
com/nextnetwireless/exp/message/basemessages/CPERegistrationMessage.java
*****CVS exited normally with code 0*****
--------> Now this confuses me; why does the previous
command show the file needs to be updated,
--------> but the following status command shows it's
up-to-date?
cvs status CpeRegistrationMessage.java (in directory
C:\nn\expedience-2.4.0\expedience\com\nextnetwireless\exp\message\baseme
ssages\)
===================================================================
File: CpeRegistrationMessage.java Status: Up-to-date
Working revision: 1.11
Repository revision: 1.11
/usr/NextNet/SWDEV/expedience/com/nextnetwireless/exp/message/basemessag
es/CPERegistrationMessage.java,v
Sticky Tag: build-2_4_0 (revision: 1.11)
Sticky Date: (none)
Sticky Options: (none)
*****CVS exited normally with code 0*****
--------> And why does the individual query update here
show that the file is OK...
cvs -n update CpeRegistrationMessage.java (in directory
C:\nn\expedience-2.4.0\expedience\com\nextnetwireless\exp\message\baseme
ssages\)
*****CVS exited normally with code 0*****
--------> but the query update on the folder it's in shows
it's out of date?
cvs -n update -P (in directory
C:\nn\expedience-2.4.0\expedience\com\nextnetwireless\exp\message\baseme
ssages\)
cvs server: Updating .
U CPERegistrationMessage.java
*****CVS exited normally with code 0*****
--------> Well, without understanding the problem, I try to
update the folder, but it complains:
cvs update -P (in directory
C:\nn\expedience-2.4.0\expedience\com\nextnetwireless\exp\message\baseme
ssages\)
cvs server: Updating .
cvs update: move away ./CPERegistrationMessage.java; it is in the way
C CPERegistrationMessage.java
*****CVS exited normally with code 1*****
--------> So I delete the file, and update the folder,
which gets the correct revision of the file:
cvs update CpeRegistrationMessage.java (in directory
C:\nn\expedience-2.4.0\expedience\com\nextnetwireless\exp\message\baseme
ssages\)
U CpeRegistrationMessage.java
*****CVS exited normally with code 0*****
--------> But, as the next output shows, a query update on
the folder still indicates that the file
--------> needs to be updated:
cvs -n update -P (in directory
C:\nn\expedience-2.4.0\expedience\com\nextnetwireless\exp\message\baseme
ssages\)
cvs server: Updating .
U CPERegistrationMessage.java
*****CVS exited normally with code 0*****
--------> And yet CVS again refuses to update it:
cvs update -P (in directory
C:\nn\expedience-2.4.0\expedience\com\nextnetwireless\exp\message\baseme
ssages\)
cvs server: Updating .
cvs update: move away ./CPERegistrationMessage.java; it is in the way
C CPERegistrationMessage.java
*****CVS exited normally with code 1*****
--------> For the record, here's some of the file log,
showing that the revision I expected is the
--------> one that was checked out (rev 1.11):
cvs log CpeRegistrationMessage.java (in directory
C:\nn\expedience-2.4.0\expedience\com\nextnetwireless\exp\message\baseme
ssages\)
*****CVS exited normally with code 0*****
Rcs file :
'/usr/NextNet/SWDEV/expedience/com/nextnetwireless/exp/message/basemessa
ges/CPERegistrationMessage.java,v'
Working file : 'CpeRegistrationMessage.java'
Head revision : 1.15
Branch revision :
Locks : strict
Access :
Symbolic names :
1.14 : 'build-2_5_2'
1.13 : 'build-2_5_1'
1.13 : 'build-2_5_0'
1.11 : 'build-2_4_1'
1.11 : 'build-2_4_0'
1.10 : 'build-2_3_1'
1.10 : 'build-2_3_0'
1.8 : 'build-220'
1.8 : 'build-216'
1.8 : 'build-214'
1.7 : 'build-018'
1.6 : 'build-017'
1.6 : 'build-015'
1.6 : 'build-013'
1.5 : 'build-012'
1.5 : 'build-011'
1.5 : 'build-010'
1.5 : 'build-009'
1.5 : 'build-008'
1.5 : 'build-006'
1.4 : 'build-005'
1.4 : 'build-004c'
1.3 : 'build-003'
1.3 : 'build-002'
1.2 : 'milestone0-1'
1.1.1.1 : 'initial'
1.1.1 : 'NextNetWireless'
Keyword substitution : 'kv'
Total revisions : 16
Selected revisions : 16
Description :
--------> I can't fathom what's happening. Can anyone
enlighten me?
- Mysterious Conflict,
Arachtingi, Mike <=