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

Mike Bechtold mbechtold at baneng.com
Wed Apr 9 15:19:29 BST 2003


Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.


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





More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook