Bug 339092 - Merge tool not enabled after Cherry Pick with conflicts
Summary: Merge tool not enabled after Cherry Pick with conflicts
Status: RESOLVED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: Core (show other bugs)
Version: 0.12   Edit
Hardware: All All
: P3 normal (vote)
Target Milestone: 0.12-M2   Edit
Assignee: Robin Stocker CLA
QA Contact:
URL:
Whiteboard:
Keywords: noteworthy
Depends on:
Blocks:
 
Reported: 2011-03-07 09:57 EST by Stefan Lay CLA
Modified: 2011-04-06 17:43 EDT (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 Stefan Lay CLA 2011-03-07 09:57:05 EST 
When a Cherry Pick leads to conflicts the Merge tool is not enabled.

The repository state is "SAFE" in this case. This leads to subsequent problems with commit (I'll open a separate bug for this).
Comment 1 Robin Stocker CLA 2011-03-31 09:05:58 EDT 
The only indication that a cherry-pick failed in Git is that there is a .git/MERGE_MSG file and the index has unmerged paths.

Repository.getRepositoryState has to be changed to test for this and CherryPickCommand needs to write MERGE_MSG on conflicting state.

Will come up with a patch as soon as I get to it.
Comment 2 Robin Stocker CLA 2011-04-03 13:42:47 EDT 
Pushed JGit change http://egit.eclipse.org/r/2996 and EGit change http://egit.eclipse.org/r/2997 for this.
Comment 3 Chris Aniszczyk CLA 2011-04-06 14:38:40 EDT 
JGit changes merged into master.
Comment 4 Robin Stocker CLA 2011-04-06 17:42:36 EDT 
EGit changes were also merged.
Comment 5 Matthias Sohn CLA 2011-04-06 17:43:49 EDT 
egit change merged as d9dcc70255dacea97d1681c4b785c63b5b17ddde