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

[Mike Bechtold]

First of all i beleive i add these files under the a branch, next i went
back to the head (mainline) these files were then removed. next i
updated/merged the folder with branch name. No these files are mark ed for
commit (looks like the files where added) I go to commit and i get the error
messages.

thanks Mike

"Aaron Kynaston" <akynaston at novell.com> wrote in message
news:mailman.957.1049902013.22290.cvsnt at cvsnt.org...
> The only reason why it would say something about the attic, is because
> files have been 'cvs remove'ed - I've had problems similar to that when
> dealing with attic files.
>
> What are you doing to get the error messages?
>
> Aaron Kynaston
> akynaston at novell.com
> office: (801) 861-6709
> cell: (801) 368-8633
> fax: (801) 861-6778
> Novell Inc., The leading provider in net services software.
> www.novell.com
>
> >>> "Mike Bechtold" <mbechtold at baneng.com> 04/09/03 08:19AM >>>
> 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
>
>
>
> _______________________________________________
> cvsnt mailing list
> cvsnt at cvsnt.org
> http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt