diff options
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2013-04-08 22:05:06 +0200 |
|---|---|---|
| committer | Robin Rosenberg <robin.rosenberg@dewire.com> | 2013-04-08 22:43:39 +0200 |
| commit | cc00feaa8d0368f4a5caefa002025e2168f71a12 (patch) | |
| tree | 28e7cdfa16689c63a221bfbb3514fb63bb606ad6 /org.eclipse.jgit | |
| parent | 59baf9148e4b16028203d9e881136ab4c005202c (diff) | |
| download | jgit-cc00feaa8d0368f4a5caefa002025e2168f71a12.tar.gz jgit-cc00feaa8d0368f4a5caefa002025e2168f71a12.zip | |
A deleted work tree file is not a conflict when merge wants to delete it
Bug: 405199
Change-Id: I4b2ef3dc432d2fad8a6fabd1c8aec407b5c8c5ac
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java | 6 |
1 files changed, 5 insertions, 1 deletions
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 2ea1160793..710996d2a8 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java @@ -488,7 +488,11 @@ public class ResolveMerger extends ThreeWayMerger { return true; } else if (modeT == 0 && modeB != 0) { // we want THEIRS ... but THEIRS contains the deletion of the - // file + // file. Also, do not complain if the file is already deleted + // locally. This complements the test in isWorktreeDirty() for + // the same case. + if (tw.getTreeCount() > T_FILE && tw.getRawMode(T_FILE) == 0) + return true; toBeDeleted.add(tw.getPathString()); return true; } |