Bug 107650 - [Patch] Create patch option to ignore line ending differences
Summary: [Patch] Create patch option to ignore line ending differences
Status: ASSIGNED
Alias: None
Product: Platform
Classification: Eclipse Project
Component: CVS (show other bugs)
Version: 3.1   Edit
Hardware: PC Windows XP
: P5 normal with 2 votes (vote)
Target Milestone: ---   Edit
Assignee: platform-cvs-inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords: helpwanted
Depends on:
Blocks:
 
Reported: 2005-08-22 14:12 EDT by Kevin Day CLA
Modified: 2019-09-06 16:19 EDT (History)
5 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Kevin Day CLA 2005-08-22 14:12:37 EDT
The create patch wizard is not cr/lf aware.  If the CR/LF encoding is different
between the version in CVS and the version stored in eclipse, then the patch
generated is for the entire file (delete full existing contents, add new contents).

If you perform a compare, it properly identifies the differences (i.e. it
ignores cr/lf differences).  The Create Patch wizard should do the same.

- K
Comment 1 Michael Valenta CLA 2005-09-07 15:07:32 EDT
There may be an option to pass to "cvs diff" for this (although I took a quick 
look and didn't see an obvious one). This would be less work than implementing 
a diff engine in Eclipse.
Comment 2 Ben Konrath CLA 2005-11-18 12:56:33 EST
I just noticed that the Compare Editor doesn't ignore cr/lf differences either.
Getting this fixed would be useful for any cross platform development (ie making
enhancements to an eclipse plugin in Linux when the plugin was originally
written using Windows). As it stands now, I have to drop down to the command
line to get any useful information when the line endings are messed up.
Comment 3 Ben Konrath CLA 2005-11-18 13:26:12 EST
I made a mistake, the reason the compare editor wasn't working correctly was
because the file I was trying to compare was marked as binary. 

Having the create patch wizard sort out line endings automatically would still
be great. Thanks.
Comment 4 Rob CLA 2006-10-04 18:49:51 EDT
Not sure if this is completely related, but I have Project line endings set to Unix and even have tried unchecking Team > CVS > Files and folders > Convert text files to use platform line ending.

But when I create a patch, the line endings are ALWAYS Windows (I'm on XP, Eclipse 3.2). How can I easily create CVS patches with Unix line endings without opening and manually converting each patch file?
Comment 5 Bogdan Gheorghe CLA 2006-10-05 09:59:38 EDT
Rob, there's currently no way to do this as we don't consult the setting when creating the patch. Please open a new bug for this.
Comment 6 Rob CLA 2006-10-07 18:53:36 EDT
I created a bug for my issue at https://bugs.eclipse.org/bugs/show_bug.cgi?id=159894
Comment 7 Eclipse Webmaster CLA 2019-09-06 16:19:12 EDT
This bug hasn't had any activity in quite some time. Maybe the problem got resolved, was a duplicate of something else, or became less pressing for some reason - or maybe it's still relevant but just hasn't been looked at yet.

If you have further information on the current state of the bug, please add it. The information can be, for example, that the problem still occurs, that you still want the feature, that more information is needed, or that the bug is (for whatever reason) no longer relevant.