Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 361504 - rebase problems
Summary: rebase problems
Status: RESOLVED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: Core (show other bugs)
Version: 1.2   Edit
Hardware: PC Windows 7
: P3 normal (vote)
Target Milestone: 1.2   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-10-20 04:04 EDT by Tim Kaiser CLA
Modified: 2011-11-30 19:25 EST (History)
3 users (show)

See Also:

Attachments
exceptions (2.54 KB, text/plain)
2011-10-20 04:04 EDT, Tim Kaiser 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 Tim Kaiser CLA 2011-10-20 04:04:36 EDT 
Created attachment 205584 [details]
exceptions

Hi,

I committed changes to the local branch, then i did a pull (with rebase strategy)
and ended up in the "rebase interactive" state and got the attached exceptions.
I do not know how to proceed from here. I interact with GIT through the eclipse UI solely.

I use yesterday's nightly build, but i experienced the problem with earlier versions as well. Previously, i helped myself using a reset but my changes were lost.

Best, Tim
Comment 1 Remy Suen CLA 2011-10-20 08:00:27 EDT 
You may want to check your 'Git Staging' view to see if there was anything in there. There may have been a conflict that needed to be resolved.
Comment 2 Tim Kaiser CLA 2011-10-20 08:19:08 EDT 
Thanks for your hint.
We have been successful resolving the local state using 
rebase on the command line.
Comment 3 Jens Baumgart CLA 2011-10-20 11:35:41 EDT 
I checked Tim's Git repository. It somehow happened that commit messages contain \r characters. A commit message should only contain \n.
The \r characters are then contained in the return of RevCommit.getShortMessage and cause rebase to fail. Furthermore the history view does not show commit messages for commits containing \r.
Comment 4 Jens Baumgart CLA 2011-10-21 04:58:02 EDT 
Fix proposed:

http://egit.eclipse.org/r/4386

Additional fixes in JGit are required to handle exisiting commits with \r in the commit message.
Comment 5 Tim Kaiser CLA 2011-10-24 03:42:30 EDT 
Mylyn generates my commit messages.
Maybe that is the source of \r.
Comment 6 Jens Baumgart CLA 2011-10-24 04:44:23 EDT 
Do you have the latest mylyn version? I tried mylyn and did not get \r.
Comment 7 Tim Kaiser CLA 2011-10-24 04:48:46 EDT 
I use mylyn 3.6.0
Comment 8 Matthias Sohn CLA 2011-11-30 19:25:11 EST 
merged as abd4106f8de2f72d32c81d6e76355aa20ca4e175