[M3devel] Another CVS problem: adding a new file

[Rodney M. Bates]

On 04/12/2013 10:19 AM, Rodney M. Bates wrote:
> m3-defn-complete.pdf is derived from m3-defn-complete.tex, but is not in the repository.
> cvs checkout says:
>
>    cvs server: cannot find module `m3-defn-complete.pdf' - ignored
>
> When I try to add it, cvs add says:
>
>    cvs add: `m3-defn-complete.pdf' added independently by second party
>
> and when I try to commit, cvs says:
>
>    cvs commit: use `cvs add' to create an entry for `m3-defn-complete.pdf'
>    cvs [commit aborted]: correct above errors first!
>
>

And after the above, when I do cvs update on a different computer, cvs says:

   cvs update: move away `complete/m3-defn-complete.pdf'; it is in the way
   C complete/m3-defn-complete.pdf

And there is indeed a local file by this name.  But MORE CVS/Entries gives:

/Makefile/1.2/Thu Apr 29 17:20:18 2010//
/m3-defn-completeimg1.png/1.2/Thu Apr 29 17:20:18 2010/-kb/
/m3-defn-completeimg2.png/1.2/Thu Apr 29 17:20:18 2010/-kb/
/nx_grp_g.png/1.2/Thu Apr 29 17:20:18 2010/-kb/
/prev_g.png/1.2/Thu Apr 29 17:20:18 2010/-kb/
/up_g.png/1.2/Thu Apr 29 17:20:18 2010/-kb/
D/html////
/m3-defn-complete.html/1.4/Fri Apr 12 15:23:26 2013//
/m3-defn-complete.ps/1.5/Fri Apr 12 15:23:28 2013/-kb/
/m3-defn-complete.tex/1.22/Wed Apr 10 16:44:07 2013//

But again, cvs log m3-defn-complete.pdf gives:

RCS file: /usr/cvs/cm3/doc/reference/complete/m3-defn-complete.pdf,v
Working file: complete/m3-defn-complete.pdf
head: 1.3
branch:
locks: strict
access list:
symbolic names:
	release_CM3_5_8_6: 1.1.2.4
	release_CM3_5_8_RC5: 1.1.2.2
	release_branch_cm3_5_8: 1.1.0.2
keyword substitution: b
total revisions: 7;	selected revisions: 7
description:
----------------------------
revision 1.3
date: 2010-04-29 12:20:18 -0500;  author: wagner;  state: Exp;  lines: +1420 -1410;  commitid: HFcCg3x7BkM9jQwu;
merge doc changes/extensions from release_branch_cm3_5_8
----------------------------

which appears to tell me it's in the head and several branches.