Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 345684 - Parallel delete/modify results in a CONFLICTING merge but getConflicting() is null
Summary: Parallel delete/modify results in a CONFLICTING merge but getConflicting() is...
Status: RESOLVED FIXED
Alias: None
Product: JGit
Classification: Technology
Component: JGit (show other bugs)
Version: unspecified   Edit
Hardware: All All
: P3 normal with 1 vote (vote)
Target Milestone: 1.0.0   Edit
Assignee: Bernard Leach CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-05-13 01:59 EDT by Bernard Leach CLA
Modified: 2011-05-19 10:28 EDT (History)
2 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 Bernard Leach CLA 2011-05-13 01:59:40 EDT 
During a merge that has a delete/modify conflict the MergeCommand returns a CONFLICTING result but getConflicting() is null.  This results in a NullPointerException in org.eclipse.jgit.pgm.Merge.

See http://code.google.com/p/gerrit/issues/detail?id=927
Comment 1 Bernard Leach CLA 2011-05-13 02:00:52 EDT 
Proposed fix;

http://egit.eclipse.org/r/#change,3409
Comment 2 Chris Aniszczyk CLA 2011-05-19 10:28:16 EDT 
Fixed as 5ec4977bb514ec8eb01dd22c3e908fe3fe6da83f.

Thanks Bernard!