Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 335567

Summary:	Reset fails with checkout conflict on bin
Product:	[Technology] EGit	Reporter:	Jens Baumgart <jens.baumgart>
Component:	Core	Assignee:	Jens Baumgart <jens.baumgart>
Status:	RESOLVED FIXED	QA Contact:
Severity:	critical
Priority:	P3	CC:	caniszczyk
Version:	0.11
Target Milestone:	---
Hardware:	PC
OS:	Windows 7
Whiteboard:

Description Jens Baumgart

2011-01-27 08:58:43 EST

org.eclipse.team.core.TeamException: mapping tree for commit
at org.eclipse.egit.core.op.ResetOperation.checkoutIndex(ResetOperation.java:238)
at org.eclipse.egit.core.op.ResetOperation.reset(ResetOperation.java:136)
at org.eclipse.egit.core.op.ResetOperation.access$0(ResetOperation.java:115)
at org.eclipse.egit.core.op.ResetOperation$1.run(ResetOperation.java:105)
at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:1975)
at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:1957)
at org.eclipse.egit.core.op.ResetOperation.execute(ResetOperation.java:109)
at org.eclipse.egit.ui.internal.job.JobUtil$1.run(JobUtil.java:37)
at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
Caused by: org.eclipse.jgit.errors.CheckoutConflictException: Checkout conflict with file: Cannot delete file: bin
at org.eclipse.jgit.dircache.DirCacheCheckout.cleanUpConflicts(DirCacheCheckout.java:805)
at org.eclipse.jgit.dircache.DirCacheCheckout.checkout(DirCacheCheckout.java:398)
at org.eclipse.egit.core.op.ResetOperation.checkoutIndex(ResetOperation.java:236)
... 8 more

I assume ContainerTreeIterator needs to be passed to DirCacheCheckout to pass the ignored info of bin (derived) to the checkout command.

Comment 1 Jens Baumgart

2011-01-28 04:06:09 EST

Fixed with commit 91af19de56759c04ca45eff91a8dfe850fa2fdf0