|Subject:||RE: "missing" file after merge|
|Date:||Tue, 8 Jan 2008 18:38:23 -0600|
Ohhh. Attempting to re-merge doesn’t help, CVS doesn’t recognize any changes to be merged (go figure). Tagging build.xml in a branch and trying to merge just it results in CVS trying to do an add, which doesn’t work either.
The message I get when trying to do a checkout is:
$ cvs co netsoft/alerts/build.xml
cvs server: warning: new-born netsoft/alerts/build.xml has disappeared
[mailto:address@hidden On Behalf Of 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  and I cannot add a new file called build.xml . Any one seen this before? Any ideas how I can resolve the issue and keep the history of the file?
Here is part of the log:
$ cvs rlog netsoft/alerts/build.xml
RCS file: /export/cvs/netsoft/alerts/build.xml,v
<lots of tags are here>
total revisions: 10; selected revisions: 10
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
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.
|[Prev in Thread]||Current Thread||[Next in Thread]|