From ff83f54d29a2e3c2fda5e25b60bd7d20347c53ca Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Tue, 4 Feb 2014 01:00:41 +0100 Subject: Failing to delete a directory with untracked content is actually ok We had a test, but it was wrong. Bug: 424630 Change-Id: I926e0954c8623a323a50fe8be3ebe5e0ac6944c8 Signed-off-by: Matthias Sohn --- org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'org.eclipse.jgit/src/org') diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java index 710996d2a8..eca2f91bef 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java @@ -244,8 +244,9 @@ public class ResolveMerger extends ThreeWayMerger { String fileName = toBeDeleted.get(i); File f = new File(db.getWorkTree(), fileName); if (!f.delete()) - failingPaths.put(fileName, - MergeFailureReason.COULD_NOT_DELETE); + if (!f.isDirectory()) + failingPaths.put(fileName, + MergeFailureReason.COULD_NOT_DELETE); modifiedFiles.add(fileName); } } finally { -- cgit v1.2.3