Bug 509548 - Failure using a Fixup that deletes a file
Summary: Failure using a Fixup that deletes a file
Status: NEW
Alias: None
Product: EGit
Classification: Technology
Component: Core (show other bugs)
Version: 4.6   Edit
Hardware: PC Windows 10
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2016-12-20 15:01 EST by Ed Willink CLA
Modified: 2016-12-20 15:01 EST (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 Ed Willink CLA 2016-12-20 15:01:04 EST 
If a file is inadvertently committed to GIT, another commit can delete it again. If this delete is used as a rebase Interactive Fixup of the erroneous create the rebase fails with:

org.eclipse.jgit.api.errors.JGitInternalException: Checkout conflict with files: 
tests/org.eclipse.qvtd.xtext.qvtcore.tests/test-gen/_umlRdbms/umlRdbms.java

	at org.eclipse.jgit.api.RebaseCommand.tryFastForward(RebaseCommand.java:1282)

	at org.eclipse.jgit.api.RebaseCommand.tryFastForward(RebaseCommand.java:1243)

	at org.eclipse.jgit.api.RebaseCommand.cherryPickCommitFlattening(RebaseCommand.java:516)

	at org.eclipse.jgit.api.RebaseCommand.cherryPickCommit(RebaseCommand.java:503)

	at org.eclipse.jgit.api.RebaseCommand.processStep(RebaseCommand.java:454)

	at org.eclipse.jgit.api.RebaseCommand.call(RebaseCommand.java:368)

	at org.eclipse.egit.core.op.RebaseOperation$1.run(RebaseOperation.java:155)

	at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2240)

	at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2267)

	at org.eclipse.egit.core.op.RebaseOperation.execute(RebaseOperation.java:175)

	at org.eclipse.egit.core.internal.job.JobUtil$2.runInWorkspace(JobUtil.java:105)

	at org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:39)

	at org.eclipse.core.internal.jobs.Worker.run(Worker.java:56)

Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files: 
tests/org.eclipse.qvtd.xtext.qvtcore.tests/test-gen/_umlRdbms/umlRdbms.java

	at org.eclipse.jgit.api.CheckoutCommand.call(CheckoutCommand.java:275)

	at org.eclipse.jgit.api.RebaseCommand.tryFastForward(RebaseCommand.java:1257)

	... 12 more

Caused by: org.eclipse.jgit.errors.CheckoutConflictException: Checkout conflict with files: 
tests/org.eclipse.qvtd.xtext.qvtcore.tests/test-gen/_umlRdbms/umlRdbms.java

	at org.eclipse.jgit.dircache.DirCacheCheckout.doCheckout(DirCacheCheckout.java:467)

	at org.eclipse.jgit.dircache.DirCacheCheckout.checkout(DirCacheCheckout.java:449)

	at org.eclipse.jgit.api.CheckoutCommand.call(CheckoutCommand.java:271)

	... 13 more