Issue 73291 - cvs wrapper seems to mess with binary files during merge
Summary: cvs wrapper seems to mess with binary files during merge
Status: CLOSED NOT_AN_OOO_ISSUE
Alias: None
Product: Build Tools
Classification: Code
Component: solenv (show other issues)
Version: current
Hardware: All Windows, all
: P2 Trivial (vote)
Target Milestone: ---
Assignee: jens-heiner.rechtien
QA Contact: issues@tools
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2007-01-09 10:15 UTC by thb
Modified: 2007-01-11 14:19 UTC (History)
1 user (show)

See Also:
Issue Type: DEFECT
Latest Confirmation in: ---
Developer Difficulty: ---

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this issue.
Description thb 2007-01-09 10:15:20 UTC 
I did this under Windows: 

cvs co vcl
cd vcl && cvs update -kk -dP -jCWS_SRC680_VCL71_ANCHOR -jcws_src680_vcl71

After that, the cursor files in vcl/win/source/src contain subtle differences
(seemingly line end conversions have been applied), e.g. in fill.cur.

Doing the same operation under Unix (both with unmodified cvs binary as well as
the wrapper script) did not produce this error.
Comment 1 jens-heiner.rechtien 2007-01-09 15:55:16 UTC 
@thb: This has nothing to do with the cvs-wrapper, it's just plain CVS behavior,
and no bug either. With 'update -kk' you turn of any potential existing binary
flag ... thus leading to exactly to the subtle differences in binary files you
mention (stemming from changing bytes with value \012 (CR) into \013\015 (CRLF)
and other funny modifications). If a file has a sticky flag "-kk" it's always
treated as "text file without special keyword expansion".

PS: This is one of the reasons why 'cwsresync -m' has to work on file-to-file basis.

PPS: Yes, this is a damn good reason to finally switch to subversion :-)
Comment 2 jens-heiner.rechtien 2007-01-09 15:58:25 UTC 
I should have mention: it was just if luck if it worked and Unix. All sequences
with '$Id: ....$' will be quenched to $Id$ in your binary file. Same for similar
 $keyword$ sequences.
Comment 3 jens-heiner.rechtien 2007-01-11 14:19:17 UTC 
Closing issue.