]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bd98a0a) | patch
Fix bug regarding handling of non-versioned files during merge 29/1929/2
authorChristian Halstrick <christian.halstrick@sap.com>
Mon, 22 Nov 2010 21:41:25 +0000 (22:41 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Mon, 22 Nov 2010 21:41:25 +0000 (22:41 +0100)
commit5adef23365a8704b64efb25e49fcf85326beee40
tree8e1e747f68267e7250ebc540139014384a4473a7tree | snapshot
parentbd98a0a9a52973704467cda892e99711524de48bcommit | diff
Fix bug regarding handling of non-versioned files during merge

There was a bug introduced by commit 0e815fe. For non-versioned files
the merge algorithm detected an incoming deletion from THEIRS.
Consequently such files were deleted. That's a severe bug which was
fixed by more precisely detecting incoming deletions.

Change-Id: I4385d3c990db11d62e371a385dc8ee89841db84a
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Signed-off-by: Philipp Thun <philipp.thun@sap.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit