Bug 462592 - FileNotFoundException when trying to merge with same named file added
Summary: FileNotFoundException when trying to merge with same named file added
Status: NEW
Alias: None
Product: EGit
Classification: Technology
Component: Core (show other bugs)
Version: 3.7   Edit
Hardware: All All
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2015-03-19 12:43 EDT by Soeren P. CLA
Modified: 2015-03-19 12:43 EDT (History)
0 users

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 Soeren P. CLA 2015-03-19 12:43:11 EDT 
Hi,

steps to reproduce:

1. create or clone some git repo, checkout master branch
2. import the working directory as a general project
3. create a new branch, named "new_feature". do not checkout.
3. add a file named "abc.txt" to the project (master branch) and commit
4. checkout the branch "new_feature"
5. add a file named "abc.txt" to the project (new_feature branch) and commit
6. try to merge "master" to "new_feature" branch. it will fail.

Error log shows:

org.eclipse.jgit.api.errors.JGitInternalException: Exception caught during execution of merge command. java.io.FileNotFoundException: C:\Users\soeren.prilop\git\Spoon-Knif\new.txt (Zugriff verweigert)
	at org.eclipse.jgit.api.MergeCommand.call(MergeCommand.java:413)
	at org.eclipse.egit.core.op.MergeOperation$1.run(MergeOperation.java:168)
	at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2313)
	at org.eclipse.egit.core.op.MergeOperation.execute(MergeOperation.java:189)
	at org.eclipse.egit.ui.internal.actions.MergeActionHandler$1.runInWorkspace(MergeActionHandler.java:71)
	at org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:38)
	at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
Caused by: java.io.FileNotFoundException: C:\Users\soeren.prilop\git\Spoon-Knif\new.txt (Zugriff verweigert)
	at java.io.FileOutputStream.open(Native Method)
	at java.io.FileOutputStream.<init>(FileOutputStream.java:213)
	at java.io.FileOutputStream.<init>(FileOutputStream.java:162)
	at org.eclipse.jgit.merge.ResolveMerger.writeMergedFile(ResolveMerger.java:794)
	at org.eclipse.jgit.merge.ResolveMerger.updateIndex(ResolveMerger.java:732)
	at org.eclipse.jgit.merge.ResolveMerger.processEntry(ResolveMerger.java:611)
	at org.eclipse.jgit.merge.ResolveMerger.mergeTreeWalk(ResolveMerger.java:1066)
	at org.eclipse.jgit.merge.ResolveMerger.mergeTrees(ResolveMerger.java:1016)
	at org.eclipse.jgit.merge.ResolveMerger.mergeImpl(ResolveMerger.java:301)
	at org.eclipse.jgit.merge.Merger.merge(Merger.java:203)
	at org.eclipse.jgit.merge.Merger.merge(Merger.java:156)
	at org.eclipse.jgit.merge.ThreeWayMerger.merge(ThreeWayMerger.java:114)
	at org.eclipse.jgit.api.MergeCommand.call(MergeCommand.java:342)
	... 6 more

org.eclipse.jgit.api.errors.JGitInternalException: Exception caught during execution of merge command. java.io.FileNotFoundException: C:\Users\soeren.prilop\git\Spoon-Knif\new.txt (Zugriff verweigert)
	at org.eclipse.jgit.api.MergeCommand.call(MergeCommand.java:413)
	at org.eclipse.egit.core.op.MergeOperation$1.run(MergeOperation.java:168)
	at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2313)
	at org.eclipse.egit.core.op.MergeOperation.execute(MergeOperation.java:189)
	at org.eclipse.egit.ui.internal.actions.MergeActionHandler$1.runInWorkspace(MergeActionHandler.java:71)
	at org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:38)
	at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
Caused by: java.io.FileNotFoundException: C:\Users\soeren.prilop\git\Spoon-Knif\new.txt (Zugriff verweigert)
	at java.io.FileOutputStream.open(Native Method)
	at java.io.FileOutputStream.<init>(FileOutputStream.java:213)
	at java.io.FileOutputStream.<init>(FileOutputStream.java:162)
	at org.eclipse.jgit.merge.ResolveMerger.writeMergedFile(ResolveMerger.java:794)
	at org.eclipse.jgit.merge.ResolveMerger.updateIndex(ResolveMerger.java:732)
	at org.eclipse.jgit.merge.ResolveMerger.processEntry(ResolveMerger.java:611)
	at org.eclipse.jgit.merge.ResolveMerger.mergeTreeWalk(ResolveMerger.java:1066)
	at org.eclipse.jgit.merge.ResolveMerger.mergeTrees(ResolveMerger.java:1016)
	at org.eclipse.jgit.merge.ResolveMerger.mergeImpl(ResolveMerger.java:301)
	at org.eclipse.jgit.merge.Merger.merge(Merger.java:203)
	at org.eclipse.jgit.merge.Merger.merge(Merger.java:156)
	at org.eclipse.jgit.merge.ThreeWayMerger.merge(ThreeWayMerger.java:114)
	at org.eclipse.jgit.api.MergeCommand.call(MergeCommand.java:342)
	... 6 more