Bug 11563

Summary:	'Create Patch' creates questionable patch files for Team 1.0 files
Product:	[Eclipse Project] Platform	Reporter:	Andre Weinand <andre_weinand>
Component:	Team	Assignee:	Michael Valenta <Michael.Valenta>
Status:	VERIFIED FIXED	QA Contact:
Severity:	normal
Priority:	P3
Version:	2.0
Target Milestone:	2.0 F2
Hardware:	PC
OS:	Windows 2000
Whiteboard:

Description Andre Weinand

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

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

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

2002-05-29 09:56:20 EDT

Fixed

Comment 4 Jean-Michel Lemieux

2002-06-03 11:27:55 EDT

Verified.