diff options
| author | Christian Halstrick <christian.halstrick@sap.com> | 2010-11-03 14:13:56 +0100 |
|---|---|---|
| committer | Christian Halstrick <christian.halstrick@sap.com> | 2010-11-07 14:59:01 +0100 |
| commit | 0e815fe8c5bd7fb4de9d82b9d25d8ad9a9ec32c4 (patch) | |
| tree | fe2d8fa809bdf7e2425ece956f05077e3db1648a /org.eclipse.jgit.pgm/resources | |
| parent | d1e8e97316f8a1349e69a773b1fb0837d9892bbd (diff) | |
| download | jgit-0e815fe8c5bd7fb4de9d82b9d25d8ad9a9ec32c4.tar.gz jgit-0e815fe8c5bd7fb4de9d82b9d25d8ad9a9ec32c4.zip | |
Fixed ResolveMerger regarding handling of deletions
There was a bug in ResolveMerger which is one reason for
bug 328841. If a merge was failing because of conflicts
deletions where not handled correctly. Files which have
to be deleted (because there was a non-conflicting deletion
coming in from THEIRS) are not deleted. In the
non-conflicting case we also forgot to delete the file but
in this case we explicitly checkout in the end these files
get deleted during that checkout.
This is fixed by handling incoming deletions explicitly.
Bug: 328841
Change-Id: I7f4c94ab54138e1b2f3fcdf34fb803d68e209ad0
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Diffstat (limited to 'org.eclipse.jgit.pgm/resources')
0 files changed, 0 insertions, 0 deletions