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

Oliver Koltermann okoltermann at gmx.de
Wed Apr 9 16:18:48 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.


"Mike Bechtold" <mbechtold at baneng.com> writes:

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

Just commit them like any other "red" file. The merging goes on in
your local sandbox. You have to commit the results to make a
repository version.

But...

> 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

...I can't give you any help with this. When do you get this output?
What cvs command are you trying?

bye,
  OK.


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