bug-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

CVS mangling files on Windows platform


From: Harvey
Subject: CVS mangling files on Windows platform
Date: Sun, 05 Dec 2010 21:07:18 -0600
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.15) Gecko/20101027 Thunderbird/3.0.10

I recently went to some lengths to import and update some code of mine into CVS. The CVS client is 1.12.12 on a Windows Vista machine. The server (Ubuntu) is currently 1.12.13. I think the server might have been 1.12.12a when I checked in some of the earlier versions of the files. The protocol is pserver on a home LAN, port 2401.

There are about 90 files in the project. When I checkout the project files, there are 4 files that are mangled and I can't seem to get them unmangled:

 xxx/res/MFCPCons.ico
 xxx/res/MFCPCons.rc2
 xxx/resource.h
 xxx/MFCPCons.rc

The .ico file is binary and correctly set up to be stored as binary in the repository. The other 3 are text. If I fix up the mangling and commit the files back to CVS, update leaves them alone but a checkout into a fresh directory (on the Windows Vista machine) gives the garbage stuff again. I did a quick check on the Ubuntu machine and the files seem to have the correct content without corruption.

On the Vista machine, the mangling appears as "Asian" characters on every second line of the text files. Every alternate second line shows up correctly. As I compose this message, the strange characters all show up as "???" below.

For example, the file resource.h should be:


//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by MFCPCons.rc
//
#define IDM_ABOUTBOX                    0x0010
#define IDD_ABOUTBOX                    100
#define IDS_ABOUTBOX                    101
#define IDD_MFCPCONS_DIALOG             102
#define IDR_MAINFRAME                   128
 ...

and what it appears as is:

//{{NO_DEPENDENCIES}}
??????????????????????????????????????????????????
// Used by MFCPCons.rc
?????
#define IDM_ABOUTBOX                    0x0010
??????????????????????????????????????????????
#define IDS_ABOUTBOX                    101
??????????????????????????????????????????????
#define IDR_MAINFRAME                   128
 ...


[On the Windows machine, the "???" characters above are Asian, all unique.]

Note that every second line has the correct content. Every alternate second line is completely corrupted.

I still have the original files and can recreate from them if necessary.

--
Harvey


reply via email to

[Prev in Thread] Current Thread [Next in Thread]