From 0b8b858aa17ae444844483e658ee008b2c3b406b Mon Sep 17 00:00:00 2001 From: Michael Lyons Date: Tue, 17 Dec 2024 13:02:32 -0500 Subject: [PATCH] [Diff] Tests from SVN documentation --- Diff/tests/syntax_test_diff.diff | 66 ++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/Diff/tests/syntax_test_diff.diff b/Diff/tests/syntax_test_diff.diff index 5fc51dc651..1d9e94fdc7 100644 --- a/Diff/tests/syntax_test_diff.diff +++ b/Diff/tests/syntax_test_diff.diff @@ -268,3 +268,69 @@ Diff3 Edit Format https://www.gnu.org/software/diffutils/manual/diffutils.html#S 8c so we may see their result. . + + +SVN sample https://svnbook.red-bean.com/en/1.7/svn-book.html#idm10685 +Index: deleted-file +\^^^^^^^^^^^^^^^^^^ meta.mapping.diff meta.diff.index meta.index.diff +\^^^^ meta.mapping.key.diff keyword.other.diff +\ ^ punctuation.separator.key-value.diff +\ ^^^^^^^^^^^^ meta.mapping.value.diff meta.toc-list.file-name.diff +=================================================================== +\^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.separator.diff punctuation.separator.block.diff +--- deleted-file (revision 3) +\^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.diff.header.from-file meta.header.from-file.diff +\^^ punctuation.definition.from-file.diff +\ ^^^^^^^^^^^^ comment.block.diff ++++ deleted-file (working copy) +\^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.diff.header.to-file meta.header.to-file.diff +\^^ punctuation.definition.to-file.diff +\ ^^^^^^^^^^^^^^ comment.block.diff +@@ -1 +0,0 @@ +\^^^^^^^^^^^^ meta.diff.range.unified meta.range.unified.diff meta.toc-list.hunk.diff +\^ punctuation.definition.range.begin.diff +\ ^^^^ support.function.diff +\ ^ punctuation.separator.sequence.diff +\ ^^ punctuation.definition.range.end.diff +-This file will be deleted. +\^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.deleted.diff +Index: changed-file +\^^^^^^^^^^^^^^^^^^ meta.mapping.diff meta.diff.index meta.index.diff +\^^^^ meta.mapping.key.diff keyword.other.diff +\ ^ punctuation.separator.key-value.diff +\ ^^^^^^^^^^^^ meta.mapping.value.diff meta.toc-list.file-name.diff +=================================================================== +--- changed-file (revision 4) ++++ changed-file (working copy) +@@ -1,6 +1,6 @@ + The letters in a line of text + Could make your day much better. + But expanded into paragraphs, +-I'd tell of kangaroos and calves +\^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.deleted.diff ++I'd tell of monkeys and giraffes +\^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.inserted.diff + Until you were all smiles and laughs + From my letter made of letters. + +Property changes on: changed-file +\^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.mapping.diff meta.diff.index meta.index.diff +\^^^^^^^^^^^^^^^^^^ meta.mapping.key.diff keyword.other.diff +\ ^ punctuation.separator.key-value.diff +\ ^^^^^^^^^^^^ meta.mapping.value.diff meta.toc-list.file-name.diff +___________________________________________________________________ +\^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.separator.diff punctuation.separator.block.diff +Added: propname +\^^^^^^^^^^^^^^ meta.mapping.diff meta.diff.index meta.index.diff +\^^^^ meta.mapping.key.diff keyword.other.diff +\ ^ punctuation.separator.key-value.diff +\ ^^^^^^^^ meta.mapping.value.diff meta.toc-list.file-name.diff +## -0,0 +1 ## ++propvalue +\^^^^^^^^^ markup.inserted.diff +Index: added-file +=================================================================== +--- added-file (revision 0) ++++ added-file (working copy) +@@ -0,0 +1 @@ ++This is an added file.