[cvsnt] merging file back in to the mainline from a branch

[Mike Bechtold]

I apparently added some file while in a branch.  I did update/merge to head
and now I have two files that are have red icon(waiting for a commit) and
are rev 0.  I'm also using WinCVS.  I don't know if this is server or client
(WinCVS)  issue.  Can some one tell me how to properly make the file added
in the Branch avail in the main line.

here are the error messages
cvs server: failed to move
`/SafetyTesting/AutoTest/_working/Profiles/Attic/PicoGuard
BCD-DiagCodes.ini,v' out of the attic: Bad address
cvs server: failed to move
`/SafetyTesting/AutoTest/_working/Profiles/Attic/PicoGuard BCD.ini,v' out of
the attic: Bad address