Bug 519794 - create a java structural diff (versus current text diff) for merges
Summary: create a java structural diff (versus current text diff) for merges
Status: NEW
Alias: None
Product: JDT
Classification: Eclipse Project
Component: Core (show other bugs)
Version: 4.6   Edit
Hardware: All Mac OS X
: P3 enhancement (vote)
Target Milestone: ---   Edit
Assignee: JDT-Core-Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2017-07-17 17:48 EDT by Jonathan Locke CLA
Modified: 2017-07-17 17:48 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 Jonathan Locke CLA 2017-07-17 17:48:16 EDT 
Merges are never quite coming out right with diff. It's not really diff's fault. It just doesn't know about source code. 

It would be very interesting if the JDT had a source-code diff which could ignore non-structural differences, understand where method and class boundaries are and use that information to perform a better merge.

-- Configuration Details --
Product: Eclipse 4.6.3.20170314-1500 (org.eclipse.epp.package.java.product)Installed Features:
 org.eclipse.jdt 3.12.3.v20170301-0400
Versioning Plugin:
 org.eclipse.platform 4.6.3.v20170301-0400