Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 323182 - Make MergeResult easier to work with
Summary: Make MergeResult easier to work with
Status: NEW
Alias: None
Product: JGit
Classification: Technology
Component: JGit (show other bugs)
Version: unspecified   Edit
Hardware: PC Mac OS X - Carbon (unsup.)
: P3 enhancement (vote)
Target Milestone: ---   Edit
Assignee: Christian Halstrick CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-08-19 14:37 EDT by Chris Aniszczyk CLA
Modified: 2012-12-30 12:24 EST (History)
4 users (show)

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 Chris Aniszczyk CLA 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 CLA 2010-08-20 01:22:44 EDT 
I'll make a proposal how improve this API