You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
From this documentation, which seems to be the most official source on the unified diff format:
The lines common to both files begin with a space character.
The tortoise.diff file used for tests does not include this space character at the start of common lines. See for example the common empty line in this snippet:
Modified: trunk/test1.txt
===================================================================--- /trunk/test1.txt 2013-10-23 19:41:56 UTC (rev 46)+++ /trunk/test1.txt 2013-10-23 19:44:39 UTC (rev 47)@@ -1,4 +1,5 @@-test1-test1+aösdhasd+asdasd-test1
\ No newline at end of file
+sadsad+asdasd
\ No newline at end of file
The svn.diff file correctly includes this space for all common lines.
So either:
Tortoise does follow unified diff format, and the example file lost space characters somehow; or
Tortoise does not follow unified diff format, in which case it is somewhat surprising that the UnifiedDiffParser implementation is currently parsing Tortoise diffs correctly.
The text was updated successfully, but these errors were encountered:
stkent
added a commit
to stkent/githubdiffparser
that referenced
this issue
May 25, 2016
The build configuration was generated by Gradle based on the original
pom.xml. Note that the current configuration is minimal and does not
include documentation or distribution tasks.
As part of this switch, the following changes were made:
- source/target compatibility bumped to 1.8;
- TestNG replaced by JUnit;
- tortoise diff tests and resources removed, as it is unknown whether
these diffs are produced in the correct unified format or not (see
thombergs#9).
From this documentation, which seems to be the most official source on the unified diff format:
The
tortoise.diff
file used for tests does not include this space character at the start of common lines. See for example the common empty line in this snippet:The
svn.diff
file correctly includes this space for all common lines.So either:
UnifiedDiffParser
implementation is currently parsing Tortoise diffs correctly.The text was updated successfully, but these errors were encountered: