mirrors/jgit - jgit - source @ dussan.org

履歴

KB Sriram 4a985f5aa8 Make diff locations more consistent DiffAlgorithms can return different edit locations for inserts or deletes, if they can be "shifted" up or down repeating blocks of lines. This causes the 3-way merge to apply both edits, resulting in incorrectly removing or duplicating lines. Augment an existing "tidy-up" stage in DiffAlgorithm to move all shiftable edits (not just the last INSERT edit) to a consistent location, and add test cases for previously incorrect merges. Bug: 514095 Change-Id: I5fe150a2fc04e1cdb012d22609d86df16dfb0b7e Signed-off-by: KB Sriram <kbsriram@google.com>		7年前
..
AbstractDiffTestCase.java	Make diff locations more consistent	7年前
DiffEntryTest.java	Enable and fix 'Should be tagged with @Override' warning	7年前
DiffFormatterReflowTest.java	Convert all JGit unit tests to JUnit 4	13年前
DiffFormatterTest.java	Enable and fix warnings about redundant specification of type arguments	7年前
EditListTest.java	cleanup: Prefer assertEquals over assertTrue(....equals(...))	11年前
EditTest.java	cleanup: Prefer assertEquals over assertTrue(....equals(...))	11年前
HistogramDiffTest.java	Convert all JGit unit tests to JUnit 4	13年前
MyersDiffTest.java	Delete DiffPerformanceTest	13年前
PatchIdDiffFormatterTest.java	PatchIdDiffFormatterTest: Open Git and PatchIdDiffFormatter in try-with-resource	8年前
RawTextIgnoreAllWhitespaceTest.java	Convert all JGit unit tests to JUnit 4	13年前
RawTextIgnoreLeadingWhitespaceTest.java	Convert all JGit unit tests to JUnit 4	13年前
RawTextIgnoreTrailingWhitespaceTest.java	Convert all JGit unit tests to JUnit 4	13年前
RawTextIgnoreWhitespaceChangeTest.java	Convert all JGit unit tests to JUnit 4	13年前
RawTextTest.java	Fix RawText.getLineDelimiter() for empty first line	9年前
RenameDetectorTest.java	Enable and fix warnings about redundant specification of type arguments	7年前
SimilarityIndexTest.java	Rename detection should canonicalize line endings	9年前