Re: "missing" file after merge

[Larry Jones]

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