On Sun, Sep 04, 2005 at 02:05:03AM -0600, Matt Squires wrote:
I have been trying to checkout and then commit some changes to text rotation in dxf2svg, but I have been having problems with the CVS update function. It appears to update some files and then it dies on a file in /src/helper. Update was working Friday afternoon.
I have tried getting fresh files, but I keep getting the same problem. Is this me, TortoiseCVS, or a more general problem? I an copying transaction output below.
Matt
In C:\Documents and Settings\Matt\Desktop\inkscape-cvs\inkscape: "C:\Program Files\TortoiseCVS\cvs.exe" "-q" "update" "-d" "-P" "." CVSROOT=:pserver:squires@...54...:/cvsroot/inkscape
? src/helper/_new_ ? src/svg/_new_ cvs update: .de.txt is no longer in the repository cvs update: .fr.txt is no longer in the repository cvs update: .it.txt is no longer in the repository cvs update: .txt is no longer in the repository U .de.txt U .fr.txt U .it.txt U .txt M src/Makefile.am cvs update: src/helper/ is no longer in the repository cvs.exe update: unable to remove src/helper/ : No such file or directory U src/helper/ cvs.exe [update aborted]: cannot rename file _new_ to : No such file or directory
Hmm, sounds like CVS is really mussed up. I haven't seen this particular error situation, but can give some generic CVS troubleshooting advice that might get you on the right path.
Before you do anything, I would suggest making a copy of your CVS tree, just in case. `cp -r inkscape inkscape-borked`
Okay, first of all it's saying that src/helper is not in the repository, yet it looks to me that it *is* in the repository, so CVS is really confused on that count. Look in your local copy to see if you have a src/helper/CVS/ directory; if not, then that could be a clue.
Next, those _new_ items shown look suspicious. Those are probably TortiseCVS specific things. Look what's in them.
Take a look in src/helper/CVS/Entries. That file lists what your local CVS checkout thinks is true. Sometimes when CVS gets really brain dead, you can manually correct that file. This is sometimes a pain in the ass, so leave it as a last resort. But it might be informative to see what's in there. My guess is that there's probably a few lines with _new_ there, which if you deleted would make cvs update properly (but you may lose whatever's in _new_).
As a last, last resort, I would create a new CVS checkout, and re-attempt to merge your changes into that branch, committing each change in a smaller, more 'atomic' sequence. For example, if you need to create new subdirs, do that first and make sure cvs adds CVS/ dirs inside them, then add a few files and commit them, and make sure those get in correctly, etc.
(Fwiw, it's been my experience that the CVS front ends often have little issues like these; cvs is difficult to interface to, since there's really no API. This is why I use the stock commandline cvs program for everything. It's also one of the several reasons that are motivating us to look at something better than CVS for version control.)
Bryce