RE: "missing" file after merge

[Barry Pape]

Beautiful.  Switching to a "good" branch and running 'cvs admin -b
netsoft/alerts/build.xml' did the trick.

Thank you very much for your explanation and solution.

Barry

-----Original Message-----
From: Larry Jones [mailto:address@hidden 
Sent: Tuesday, January 08, 2008 11:25 PM
To: Barry Pape
Cc: address@hidden
Subject: Re: "missing" file after merge

Barry Pape writes:
> 
> RCS file: /export/cvs/netsoft/alerts/build.xml,v
> head: 1.7
> branch: 1.7.4

That's probably the problem -- the default branch for this file, which
should normally be set to the vendor branch or nothing, is instead set
to what is likely a non-existent branch.  This implies that someone has
been playing with "cvs admin -b" without knowing what they're doing.

A plain "cvs admin -b" on the file will reset the default branch to the
trunk, which is probably what you want.  In the unlikely case that the
file has been imported and you really want to revert to the most recent
revision on the vendor branch rather than the most recent revision on
the trunk, you would need "cvs admin -bXXX" where XXX is whatever your
vendor branch tag is.

-Larry Jones

Even if lives DID hang in the balance, it would depend on whose they
were.
-- Calvin

-----------------------------------------
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.