Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 331078 - Rebase rolls back due to conflict but there should be no conflict
Summary: Rebase rolls back due to conflict but there should be no conflict
Status: RESOLVED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: Core (show other bugs)
Version: 0.10.0   Edit
Hardware: PC Mac OS X - Carbon (unsup.)
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-11-24 19:12 EST by Matthias Sohn CLA
Modified: 2012-11-05 14:27 EST (History)
2 users (show)

See Also:

Attachments
test repository (27.23 KB, application/zip)
2010-11-24 19:13 EST, Matthias Sohn CLA 		no flags Details
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 Matthias Sohn CLA 2010-11-24 19:12:57 EST 
This is a problem I found when testing http://egit.eclipse.org/r/#change,1942 patchset 1.

When trying to rebase the two branches in the attached sample repository rebase is aborted due to a conflict detected by EGit/JGit:
- checkout branch helloworld
- call rebase on master branch from repositories view
- EGit aborts the rebase claiming it found a conflict.

Trying the same rebase using native git succeeds.
Comment 1 Matthias Sohn CLA 2010-11-24 19:13:48 EST 
Created attachment 183814 [details]
test repository
Comment 2 Stefan Lay CLA 2010-11-25 04:20:28 EST 
This error boiles down to the underlying cherry-pick command. 

You can do the following:
- Check out master
- Cherry-pick helloworld

Native git does this without a conflict, whereas jgit reports a conflict.
Comment 3 Robin Rosenberg CLA 2012-11-05 14:27:34 EST 
Fixed a long time ago in 12a5c8d413baab3f27932a7c850dbfc0407ded78 and 049827d7080201fe24f2728b26d681434327f72a
Comment 4 Robin Rosenberg CLA 2012-11-05 14:27:55 EST 
..