diff options
| author | Patrick Hiesel <hiesel@google.com> | 2024-05-27 16:11:40 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2024-05-27 18:57:19 +0200 |
| commit | c0c59ccf2d320c1d50f3ad949e5369ae167b8fb5 (patch) | |
| tree | 22f2528f9bb7cfcb7fa4bc8fcb3eefa40956867d /org.eclipse.jgit.test | |
| parent | f5f33be8ca9b49c506d6f0ea296b65c5d649aaa4 (diff) | |
| download | jgit-c0c59ccf2d320c1d50f3ad949e5369ae167b8fb5.tar.gz jgit-c0c59ccf2d320c1d50f3ad949e5369ae167b8fb5.zip | |
PatchApplier: Set a boolean on the result if conflict markers were added
This will let callers show a different error message or mark the
state as conflicting.
Change-Id: Id8eea614b6b8d54c62b49ffbac90599e6f4c5efa
Diffstat (limited to 'org.eclipse.jgit.test')
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java index 8f3478db18..eec403a976 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java @@ -376,7 +376,7 @@ public class PatchApplierTest { error.hh = null; // We don't assert the hunk header as it is a // complex object with lots of internal state. assertEquals(error, new PatchApplier.Result.Error( - "cannot apply hunk", "allowconflict", null)); + "cannot apply hunk", "allowconflict", null, true)); verifyChange(result, "allowconflict", true, 1); } @@ -391,7 +391,7 @@ public class PatchApplierTest { error.hh = null; // We don't assert the hunk header as it is a // complex object with lots of internal state. assertEquals(error, new PatchApplier.Result.Error( - "cannot apply hunk", "ConflictOutOfBounds", null)); + "cannot apply hunk", "ConflictOutOfBounds", null, true)); verifyChange(result, "ConflictOutOfBounds", true, 1); } |