Re: [Scribia-dev] lots of mods

[Charles L. <da...@sy...>]

>At 8:30 PM -0800 3/19/01, Lark wrote:
>>>
>>>- removed from project:
>>>	CItemsTable.cp CItemsTable.h CSharesTable.cp CSharesTable.h
>>>CKillsTable.cp CKillsTable.h
>>>- added to project:
>>>	CMapTable.cp CMapTable.h
>>
>>Those files don't seem to be in the repository yet.
>
>
>oops, added

the new files seem to be there. however, Scribia still doesn't compile
here. CScribiaDocumentWindow.cp still includes CSharesTable.h, and that
file no longer compiles (apparently because of changes in CSharesView).
commenting out the #include seems to work, but did you forget to commit any
changes to CScribiaDocumentWindow?

>>Also, you can just CVS remove the obsolete files; they can be
>>resurrected from the CVS attic shoul we need them in the future.
>
>
>Ok, tried that, got this error:
>
>file `scribia/Source/CItemsTable.cp' still in working directory
>1 file exists; remove it first
>
>If i remove the file from my local directory i cant do "Remove". so
>tell me how to do this. :)

what CVS client are you using? i'm using MacCVS Pro (quite obviously :),
and i just tried adding and them removing a file. it worked, here's my log:

scheduling file `foobar' for addition
use 'cvs commit' to add this file permanently
RCS file: /cvsroot/scribia/scribia/Documentation/foobar,v
done
Checking in scribia/Documentation/foobar;
/cvsroot/scribia/scribia/Documentation/foobar,v  <--  foobar
initial revision: 1.1
done
scheduling `scribia/Documentation/foobar' for removal
use 'cvs commit' to remove this file permanently
Removing scribia/Documentation/foobar;
/cvsroot/scribia/scribia/Documentation/foobar,v  <--  foobar
new revision: delete; previous revision: 1.1
done

after doing Remove i was instructed to Commit (?), which i did - and the
file got removed.


--

charles lechasseur - da...@sy...
http://www3.sympatico.ca/danov/marathon/

  "The butts of evil are awaiting my bootprints!"
     - Minsc