]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4a6d04b) | patch
PatchApplier: Add test for conflict markers on a deleted file 91/1195291/2
authorPatrick Hiesel <hiesel@google.com>
Mon, 27 May 2024 08:16:34 +0000 (10:16 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Mon, 27 May 2024 16:02:05 +0000 (18:02 +0200)
commitf5f33be8ca9b49c506d6f0ea296b65c5d649aaa4
treeffd9f4271361503a237942203f1a79567d6a2820tree | snapshot
parent4a6d04b25b211faf6498ce8ae9ee034be3566dc7commit | diff
PatchApplier: Add test for conflict markers on a deleted file

For deleted files, we want to keep erroring out even if conflicts
are allowed for the apply patch logic. The resulting file would
otherwise only consist of the patch.

Change-Id: I18defa627ad2223a3a917d2b0ee4189396732533
org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/allowconflict_file_deleted.patch [new file with mode: 0644] blob
org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit