"missing" file after merge

[Barry Pape]

Howdy Fellow CVSers,

I have an odd situation I am trying to resolve.  We have an project that has been branched and merged many times.  And I just merged and branched the project again today.  But after the merge a file (build.xml) is “missing” from HEAD (and subsequently the new branch, which is what alerted me to the issue).  I say missing because an update or checkout of HEAD does not retrieve the file, but it shows up in the log [1] and I cannot add a new file called build.xml [2].  Any one seen this before?  Any ideas how I can resolve the issue and keep the history of the file?

[1]

Here is part of the log:

$ cvs rlog netsoft/alerts/build.xml

RCS file: /export/cvs/netsoft/alerts/build.xml,v

head: 1.7

branch: 1.7.4

locks: strict

access list:

symbolic names:

        alertspush: 1.7

<lots of tags are here>

total revisions: 10;    selected revisions: 10

description:

----------------------------

revision 1.7

date: 2007/10/25 20:33:59;  author: bpape;  state: Exp;  lines: +13 -1

cvs merge nov2007 to head as of alerts-head-create-nov2007

----------------------------

[2]

When I try to add the file:

cvs server: cannot add file `build.xml' when RCS file `/cvs/netsoft/alerts/build.xml,v' already exists

cvs [server aborted]: correct above errors first!

Any advice is much appreciated.

Thanks,

Barry

---

Confidentiality Notice!
This electronic transmission and any attached documents or other
writings are confidential and are for the sole use of the intended
recipient(s) identified above. This message may contain information
that is privileged, confidential or otherwise protected from
disclosure under applicable law. If the receiver of this
information is not the intended recipient, or the employee, or
agent responsible for delivering the information to the intended
recipient, you are hereby notified that any use, reading,
dissemination, distribution, copying or storage of this information
is strictly prohibited. If you have received this information in
error, please notify the sender by return email and delete the
electronic transmission, including all attachments from your
system.

---

Confidentiality Notice!
This electronic transmission and any attached documents or other
writings are confidential and are for the sole use of the intended
recipient(s) identified above. This message may contain information
that is privileged, confidential or otherwise protected from
disclosure under applicable law. If the receiver of this
information is not the intended recipient, or the employee, or
agent responsible for delivering the information to the intended
recipient, you are hereby notified that any use, reading,
dissemination, distribution, copying or storage of this information
is strictly prohibited. If you have received this information in
error, please notify the sender by return email and delete the
electronic transmission, including all attachments from your
system.