Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 352884 - rebase continue operation doesn't work properly
Summary: rebase continue operation doesn't work properly
Status: NEW
Alias: None
Product: JGit
Classification: Technology
Component: JGit (show other bugs)
Version: unspecified   Edit
Hardware: PC All
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-07-22 11:34 EDT by Piotr Janik CLA
Modified: 2011-07-22 11:35 EDT (History)
1 user (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 Piotr Janik CLA 2011-07-22 11:34:54 EDT 
I'm implementing the rebase operation in Orion and I've noticed strange behaviour of rebase continue operation: Comment 8, Bug 351429.
I cannot reproduce this bug myself. However, "Orion part" seems to work properly. 
Strange fact is that after resolving conflicts, RebaseCommand.call() returns status: FAST_FORWARD, and later Repository.getRepositoryState() returns: REBASING_INTERACTIVE. It seems to me like a bug in JGit. As Szymon reports, console version git rebase --continue works properly after resolving conflicts.