Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 339531 - Merge when a file is dirty causes "Internal Error" dialog to pop-up + logs to error log
Summary: Merge when a file is dirty causes "Internal Error" dialog to pop-up + logs to...
Status: RESOLVED DUPLICATE of bug 327573
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: 0.12   Edit
Hardware: PC Linux-GTK
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-03-10 09:46 EST by James Blackburn CLA
Modified: 2011-03-10 09:48 EST (History)
0 users

See Also:

Attachments
screenshot (38.32 KB, image/png)
2011-03-10 09:46 EST, James Blackburn 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 James Blackburn CLA 2011-03-10 09:46:19 EST 
Created attachment 190864 [details]
screenshot

Using current nightly:
 Eclipse EGit (Incubation)    0.12.0.201103040937 org.eclipse.egit.feature.group
 Eclipse JGit (Incubation)    0.12.0.201103040915 org.eclipse.jgit.feature.group

If you try to merge two branches, and the working tree is dirty (and the merge would touch the modified file), you get a very unfriendly internal error dialog (attached).

Doing this in a test project, I get an Internal Error dialog, and two errors logged to the error log.  Note you must press: "Details >>" to find out what caused the merge fail.  

For the same operation cgit says:

"bash:jamesb:xl-cbga-20:32814> git merge branch1
Updating d1cfbf6..59a7ae8
error: Your local changes to 'asdf2' would be overwritten by merge.  Aborting.
Please, commit your changes or stash them before you can merge."

Egit should be similarly helpful.
Comment 1 James Blackburn CLA 2011-03-10 09:48:51 EST 
And it's a dupe...

*** This bug has been marked as a duplicate of bug 327573 ***