[cvsnt] Re: Corrupted Word Doc
grstarrett at cox.net
Wed Apr 27 17:08:57 BST 2005
dzielke at aep.com wrote:
> Glen -
> Our server is running cvsnt version 2.0.58b. On the client side we use
> WinCVS and Tortoise. We are using a beta version of WinCVS (WinCVS
> 126.96.36.199 Beta 20 (build 3)), which I've just updated to the 188.8.131.52
> $ cvs log CogCafBranchMergeAndTag.doc
> RCS file: /usr/local/cvs/doc/CogCafBranchMergeAndTag.doc,v
> Working file: CogCafBranchMergeAndTag.doc
> head: 1.2
> locks: strict
> access list:
> symbolic names:
> keyword substitution: b
> total revisions: 2; selected revisions: 2
> The really wierd thing about this is that I just printed out the document
> successfully without opening it (right-click & "print"). So at least I
> can re-do my changes. Should I delete revision 1.2 first or can I just
> check in a new version on top of it?
Sounds strange, but I'd say check it in on top of the other then once
it's all working properly you can either label the old revision or
remove it with the admin -o command.
Can you check out revision 1.1 and open it properly?
Something I just noticed -- by the file name, looks like you've been
merging the branch that the binary doc is on. If you used cvs up -kk
-jbranch to do that then you probably messed up the file at that point
since -kk tells cvs to treat files like text. I don't see that in your
log though, so this might not be applicable.
More information about the cvsnt