[Issue 258] New - using cvs under cygwin with dos text mode with binary files

[email protected] 29 Jun 2005 01:29:41 -0000
Newsgroups gmane.comp.version-control.cvs.issuezilla
Message-ID <[email protected]>
https://ccvs.cvshome.org/issues/show_bug.cgi?id=258
                 Issue #|258
                 Summary|using cvs under cygwin with dos text mode with binary 
                        |files
               Component|ccvs
                 Version|1.11.17
                Platform|PC
                     URL|
              OS/Version|Windows 2000
                  Status|NEW
       Status whiteboard|
                Keywords|
              Resolution|
              Issue type|ENHANCEMENT
                Priority|P3
            Subcomponent|checkout/export/update
             Assigned to|issues@ccvs
             Reported by|jashar






------- Additional comments from [email protected] Tue Jun 28 18:29:41 -0700 2005 -------
Situation:
binary file
locally modified in windows
newer version in repository, modified in linux
cygwin in dos text file type mode

Command:
cvs update

Output:
U expense.xls
cvs update: nonmergeable file needs merge
cvs update: revision 1.30 from repository is now in expense.xls
cvs update: file from working directory is now in .#expense.xls.1.29
C expense.xls

Result:
.#expense.xls.1.29 is corrupt

Suspected cause:
moving of expense.xls to .#expense.xls.1.29 is done by cvs character for
character, thereby destroying the newline information