I have trouble with 4 files in my CVS project. Each time I commit one of those files, CVS keeps adding the same line of code at the end of it. This line of code is a repeated line of the current file (but not the last line of it).
I’ve try several things : update, delete lines and commit, delete all lines and commit, adding lines and commit, adding header and commit. But I always get the same line of code added to the end of my file. I could delete all files and recreate those, but I would lost all my history data.
I find it awkward that CVS is modifying my file when I commit. Is it not counter productive as it may add errors in a compliant code?
I could add that my file is a .strings (text file, unicode). I’m working on a branch, but recently merge it in the trunk.
More Details:
-
I’m using TortoiseSVN on a virtual Windows machine, which has access to my Documents folder of Mac OS X via a Network Drive between those two.
-
It turns out that my colleague, which has the same project but on a real Windows folder, could commit without any problem.
-
And now that he done that, the problem is solve for me too.
-
But I have no idea what happen. My only clue would be a hidden character in Mac OS X that would breaks TortoiseSVN. Is it possible?
I haven’t experienced this issue with CVS, but note that you mention that the file you are editing is Unicode text (you don’t mention if this means UTF8 or UTF16, but either can cause issues).
Depending on how your CVS server was built, and how (and on what platform) it is being run, it is highly possible that the server is not Unicode-aware. This can cause a whole range of possible issues, including expanding RCS-style $ tags in places where the second (or later) byte of a Unicode character is equal to ASCII ‘$’.
The workaround for this is to mark Unicode source files as binary objects. From the command line, this can be done using
when adding a new file, or
for an existing file (replace file-name with the name of your file).
In the latter case, I’d recommend removing the (local copy of the) file and running ‘cvs update’ to get it back after changing the type.
Note that doing this is unlikely to help with changes you’re already seeing in the file, so make sure to check the file, and fix any existing problem after making this change.