Bug 11563 - 'Create Patch' creates questionable patch files for Team 1.0 files
Summary: 'Create Patch' creates questionable patch files for Team 1.0 files
Status: VERIFIED FIXED
Alias: None
Product: Platform
Classification: Eclipse Project
Component: Team (show other bugs)
Version: 2.0   Edit
Hardware: PC Windows 2000
: P3 normal (vote)
Target Milestone: 2.0 F2   Edit
Assignee: Michael Valenta CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2002-03-18 11:25 EST by Andre Weinand CLA
Modified: 2002-06-03 11:27 EDT (History)
0 users

See Also:

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

Note You need to log in before you can comment on or make changes to this bug.
Description Andre Weinand CLA 2002-03-18 11:25:36 EST 
20020314
If I create a patch file with Team/Create Patch... the resulting file inserts
strange line separators for all 'old', that is 'binary' source files.
Their line separator become '\r\r\n', all other lines have the (Windows) line 
separator '\r\n'.

If you open a patch file in the Eclipse text editor every 'real' line is 
followed by an empty line because the Eclipse text editor can deal with 
heterogenous line separators and sees a '\r' followed by a '\r\n'.

I added a workaround for this problem to the 'Compare with Patch' code which 
silently ignores empty lines within a hunk.
Comment 1 Jean-Michel Lemieux CLA 2002-04-15 16:04:10 EDT 
This is a side-effect of VCM 1.0's incorrect usage of binary files. I don't how
this can be resolved. If a binary file is edited as a text file then EOL
conversions aren't performed and '\r\n' characters added by Eclipse will be sent
to the server. The server-side diff command adds the extra '\r'.
Comment 2 Michael Valenta CLA 2002-05-24 08:16:29 EDT 
I think we should have a look at this for F1. I think it may be an easy fix.
Comment 3 Michael Valenta CLA 2002-05-29 09:56:20 EDT 
Fixed
Comment 4 Jean-Michel Lemieux CLA 2002-06-03 11:27:55 EDT 
Verified.