Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 325705 - Add Resolve-In-Core content merge strategy
Summary: Add Resolve-In-Core content merge strategy
Status: RESOLVED FIXED
Alias: None
Product: JGit
Classification: Technology
Component: JGit (show other bugs)
Version: unspecified   Edit
Hardware: PC Mac OS X - Carbon (unsup.)
: P3 normal (vote)
Target Milestone: 0.10.0-M1   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-09-19 14:28 EDT by Dmitry Fink CLA
Modified: 2010-10-22 07:32 EDT (History)
1 user (show)

See Also:

Attachments
Patch file (18.32 KB, patch)
2010-09-19 14:29 EDT, Dmitry Fink CLA 		no flags Details | Diff
View All 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 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.