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

Bug 325705

Summary: Add Resolve-In-Core content merge strategy
Product: [Technology] JGit Reporter: Dmitry Fink <jgit>
Component: JGitAssignee: Project Inbox <jgit.core-inbox>
Status: RESOLVED FIXED QA Contact:
Severity: normal    
Priority: P3 CC: stefan.lay
Version: unspecified   
Target Milestone: 0.10.0-M1   
Hardware: PC   
OS: Mac OS X - Carbon (unsup.)   
Whiteboard:
Attachments:
Description Flags
Patch file none

Description Dmitry Fink CLA 2010-09-19 14:28:12 EDT 
Current JGit ResolveMerger can't operate on a bare repository, every step of the process it assumes there is a real working directory underneath (cache, traversing, file content merging, checking out the files in the end, etc).
This is not suitable for tools that do automatic merges and cherry-picks on bare repositories, one of such tools would be gerrit, I have already tested it with my local modified version of gerrit on a project set to cherry-picking, and it looks good, trivial path conflicts are resolved automatically during submissions.
Comment 1 Dmitry Fink CLA 2010-09-19 14:29:00 EDT 
Created attachment 179216 [details]
Patch file
Comment 2 Stefan Lay CLA 2010-10-22 07:32:51 EDT 
Fixed with 906887a73586a7fa2ffdeaa8041e045cfbcfd7e2.