Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit » rebase fails: "cannot delete file"
rebase fails: "cannot delete file" [message #912561] Thu, 13 September 2012 15:18 Go to next message
Brian Vosburgh is currently offline Brian Vosburgh
Messages: 129
Registered: July 2009
Senior Member
I have a large (more than 100 modified files) commit I am trying to rebase to a more current parent commit. If the new parent commit consists of only small, non-conflicting changes, the rebase has no problem. But if the new parent commit is larger and conflicts with my commit (on the order of 20 conflicting files), the rebase always fails. The error dialog usually says something like this:

Checkout conflict with file: Cannot delete file: C:\Users\Brian\dev\Workspaces\dali-master-3\webtools.dali\common\plugins\org.eclipse.jpt.common.utility\src\org\eclipse\jpt\common\utility\internal\ArrayTools.java
Checkout conflict with file: Cannot delete file: C:\Users\Brian\dev\Workspaces\dali-master-3\webtools.dali\common\plugins\org.eclipse.jpt.common.utility\src\org\eclipse\jpt\common\utility\internal\ArrayTools.java


I am also unable to merge the commits using EGit.

I can use TortoiseGit to perform the rebase and resolve the conflicts outside the Eclipse workspace without a problem.

Is this a bug? I did not see one like it on Bugzilla. Is there a workaround?

Thanks.

Report message to a moderator

Re: rebase fails: "cannot delete file" [message #925291 is a reply to message #912561] Thu, 27 September 2012 11:20 Go to previous messageGo to next message
Matthias Sohn is currently offline Matthias Sohn
Messages: 395
Registered: July 2009
Senior Member
Which EGit version are you using ? Are files reported in this conflict error message
deleted in one of the involved commits ?

Report message to a moderator

Re: rebase fails: "cannot delete file" [message #925407 is a reply to message #925291] Thu, 27 September 2012 13:35 Go to previous messageGo to next message
Brian Vosburgh is currently offline Brian Vosburgh
Messages: 129
Registered: July 2009
Senior Member
Matthias Sohn wrote on Thu, 27 September 2012 11:20
Which EGit version are you using ? Are files reported in this conflict error message
deleted in one of the involved commits ?


EGit 2.0.0

Yes, the file reported in the error message (ArrayTools.java in this case) is to be deleted by the commit I am trying to rebase.

Report message to a moderator

Re: rebase fails: "cannot delete file" [message #925532 is a reply to message #925407] Thu, 27 September 2012 16:29 Go to previous messageGo to next message
Matthias Sohn is currently offline Matthias Sohn
Messages: 395
Registered: July 2009
Senior Member
Could you retry the same scenario with EGit 2.1 which I released yesterday ?

Report message to a moderator

Re: rebase fails: "cannot delete file" [message #930259 is a reply to message #912561] Tue, 02 October 2012 02:43 Go to previous messageGo to next message
nelson 32 is currently offline nelson 32
Messages: 2
Registered: October 2012
Junior Member
Long Path Tool helped me in this situation. PathTooDeep.com

Report message to a moderator

Re: rebase fails: "cannot delete file" [message #940480 is a reply to message #925532] Thu, 11 October 2012 13:19 Go to previous messageGo to next message
Brian Vosburgh is currently offline Brian Vosburgh
Messages: 129
Registered: July 2009
Senior Member
Matthias Sohn wrote on Thu, 27 September 2012 16:29
Could you retry the same scenario with EGit 2.1 which I released yesterday ?

I have moved to EGit 2.1 (on Eclipse 3.8.1) and this large commit no longer has problems with rebasing. The commits from origin on top of which I am rebasing are not as large and "conflicted" with my commit as the earlier, problematic, commit; but it does seem like my problem is fixed.

Report message to a moderator

Re: rebase fails: "cannot delete file" [message #941418 is a reply to message #940480] Fri, 12 October 2012 09:56 Go to previous message
Neelson 32 is currently offline Neelson 32
Messages: 2
Registered: October 2012
Junior Member
Long Path Tool helped me in this situation. pathtoodeep.com

Report message to a moderator

Previous Topic:How to clone or checkout a specific branch ?
Next Topic:fatal: ambiguous argument 'origin/master': unknown revision or path not in the working tree.
Goto Forum:
  

[ Syndicate this forum (XML) ] [ RSS ]

Current Time: Sun May 26 04:21:20 EDT 2013

Powered by FUDForum. Page generated in 0.01713 seconds