Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 323182

Summary:	Make MergeResult easier to work with
Product:	[Technology] JGit	Reporter:	Chris Aniszczyk <caniszczyk>
Component:	JGit	Assignee:	Christian Halstrick <christian.halstrick>
Status:	NEW ---	QA Contact:
Severity:	enhancement
Priority:	P3	CC:	christian.halstrick, christian.halstrick, matthias.sohn, robin.rosenberg
Version:	unspecified
Target Milestone:	---
Hardware:	PC
OS:	Mac OS X - Carbon (unsup.)
Whiteboard:

Description Chris Aniszczyk

2010-08-19 14:37:38 EDT

From Shawn...

"For this high-level of our API we should have this be a lot easier to work with.  Its a ton more code, but application developers would appreciate something cleaner than a Map of int arrays of int arrays. Just saying it is painful.

We should do a FileConflictInfo object that is the value of this map, so we have Map<String /* path */, FileConflictInfo>.

The FileConflictInfo can then have a List<ConflictHunk> to describe all of the hunks that are conflicting.

Each ConflictHunk can then provide more detail about the range that is conflicting for each parent that was put in."

Comment 1 Christian Halstrick

2010-08-20 01:22:44 EDT

I'll make a proposal how improve this API