From dfcaf93a8ad9619debb07f2b9e141586fa34293b Mon Sep 17 00:00:00 2001 From: sdottaka Date: Fri, 11 Aug 2023 17:32:00 +0900 Subject: [PATCH] Fix the problem that when comparing with the BinaryContents compare method, the contents of the files are identical, but if one side is a symbolic link, it is judged to be different. refs #1976 --- .gitignore | 32 +++++++++++++++++++++ Src/CompareEngines/BinaryCompare.cpp | 17 +++++++---- Testing/Data/Symlink/CreateSymlink.cmd | 32 +++++++++++++++++++++ Testing/Data/Symlink/Dir1/f1_s0.txt | 0 Testing/Data/Symlink/Dir1/f1_s1.txt | 1 + Testing/Data/Symlink/Dir1/ff12_diff_s01.txt | 0 Testing/Data/Symlink/Dir1/ff12_diff_s10.txt | 1 + Testing/Data/Symlink/Dir1/ff12_diff_s11.txt | 1 + Testing/Data/Symlink/Dir1/ff12_diff_s12.txt | 1 + Testing/Data/Symlink/Dir1/ff12_diff_s21.txt | 1 + Testing/Data/Symlink/Dir1/ff12_same_s00.txt | 0 Testing/Data/Symlink/Dir1/ff12_same_s11.txt | 1 + Testing/Data/Symlink/Dir1/fs12_diff_s01.txt | 0 Testing/Data/Symlink/Dir1/fs12_diff_s10.txt | 1 + Testing/Data/Symlink/Dir1/fs12_diff_s11.txt | 1 + Testing/Data/Symlink/Dir1/fs12_diff_s12.txt | 1 + Testing/Data/Symlink/Dir1/fs12_diff_s21.txt | 1 + Testing/Data/Symlink/Dir1/fs12_same_s00.txt | 0 Testing/Data/Symlink/Dir1/fs12_same_s11.txt | 1 + Testing/Data/Symlink/Dir2/f2_s0.txt | 0 Testing/Data/Symlink/Dir2/f2_s1.txt | 1 + Testing/Data/Symlink/Dir2/ff12_diff_s01.txt | 1 + Testing/Data/Symlink/Dir2/ff12_diff_s10.txt | 0 Testing/Data/Symlink/Dir2/ff12_diff_s11.txt | 1 + Testing/Data/Symlink/Dir2/ff12_diff_s12.txt | 1 + Testing/Data/Symlink/Dir2/ff12_diff_s21.txt | 1 + Testing/Data/Symlink/Dir2/ff12_same_s00.txt | 0 Testing/Data/Symlink/Dir2/ff12_same_s11.txt | 1 + Testing/Data/Symlink/Dir2/sf12_diff_s01.txt | 1 + Testing/Data/Symlink/Dir2/sf12_diff_s10.txt | 0 Testing/Data/Symlink/Dir2/sf12_diff_s11.txt | 1 + Testing/Data/Symlink/Dir2/sf12_diff_s12.txt | 1 + Testing/Data/Symlink/Dir2/sf12_diff_s21.txt | 1 + Testing/Data/Symlink/Dir2/sf12_same_s00.txt | 0 Testing/Data/Symlink/Dir2/sf12_same_s11.txt | 1 + 35 files changed, 98 insertions(+), 5 deletions(-) create mode 100644 Testing/Data/Symlink/CreateSymlink.cmd create mode 100644 Testing/Data/Symlink/Dir1/f1_s0.txt create mode 100644 Testing/Data/Symlink/Dir1/f1_s1.txt create mode 100644 Testing/Data/Symlink/Dir1/ff12_diff_s01.txt create mode 100644 Testing/Data/Symlink/Dir1/ff12_diff_s10.txt create mode 100644 Testing/Data/Symlink/Dir1/ff12_diff_s11.txt create mode 100644 Testing/Data/Symlink/Dir1/ff12_diff_s12.txt create mode 100644 Testing/Data/Symlink/Dir1/ff12_diff_s21.txt create mode 100644 Testing/Data/Symlink/Dir1/ff12_same_s00.txt create mode 100644 Testing/Data/Symlink/Dir1/ff12_same_s11.txt create mode 100644 Testing/Data/Symlink/Dir1/fs12_diff_s01.txt create mode 100644 Testing/Data/Symlink/Dir1/fs12_diff_s10.txt create mode 100644 Testing/Data/Symlink/Dir1/fs12_diff_s11.txt create mode 100644 Testing/Data/Symlink/Dir1/fs12_diff_s12.txt create mode 100644 Testing/Data/Symlink/Dir1/fs12_diff_s21.txt create mode 100644 Testing/Data/Symlink/Dir1/fs12_same_s00.txt create mode 100644 Testing/Data/Symlink/Dir1/fs12_same_s11.txt create mode 100644 Testing/Data/Symlink/Dir2/f2_s0.txt create mode 100644 Testing/Data/Symlink/Dir2/f2_s1.txt create mode 100644 Testing/Data/Symlink/Dir2/ff12_diff_s01.txt create mode 100644 Testing/Data/Symlink/Dir2/ff12_diff_s10.txt create mode 100644 Testing/Data/Symlink/Dir2/ff12_diff_s11.txt create mode 100644 Testing/Data/Symlink/Dir2/ff12_diff_s12.txt create mode 100644 Testing/Data/Symlink/Dir2/ff12_diff_s21.txt create mode 100644 Testing/Data/Symlink/Dir2/ff12_same_s00.txt create mode 100644 Testing/Data/Symlink/Dir2/ff12_same_s11.txt create mode 100644 Testing/Data/Symlink/Dir2/sf12_diff_s01.txt create mode 100644 Testing/Data/Symlink/Dir2/sf12_diff_s10.txt create mode 100644 Testing/Data/Symlink/Dir2/sf12_diff_s11.txt create mode 100644 Testing/Data/Symlink/Dir2/sf12_diff_s12.txt create mode 100644 Testing/Data/Symlink/Dir2/sf12_diff_s21.txt create mode 100644 Testing/Data/Symlink/Dir2/sf12_same_s00.txt create mode 100644 Testing/Data/Symlink/Dir2/sf12_same_s11.txt diff --git a/.gitignore b/.gitignore index 19cd8892aef..8a1eece0da1 100644 --- a/.gitignore +++ b/.gitignore @@ -90,3 +90,35 @@ Plugins/src_VCPP/WatchBeginningOfLog/WatchBeginningOfLog.h Plugins/src_VCPP/WatchEndOfLog/WatchEndOfLog.h Tools/Scripts/MenuResources.txt Tools/Scripts/UnusedResources.txt +Testing/Data/Symlink/Dir1/s1_s0.txt +Testing/Data/Symlink/Dir1/s1_s1.txt +Testing/Data/Symlink/Dir1/sf12_diff_s01.txt +Testing/Data/Symlink/Dir1/sf12_diff_s10.txt +Testing/Data/Symlink/Dir1/sf12_diff_s11.txt +Testing/Data/Symlink/Dir1/sf12_diff_s12.txt +Testing/Data/Symlink/Dir1/sf12_diff_s21.txt +Testing/Data/Symlink/Dir1/sf12_same_s00.txt +Testing/Data/Symlink/Dir1/sf12_same_s11.txt +Testing/Data/Symlink/Dir1/ss12_diff_s01.txt +Testing/Data/Symlink/Dir1/ss12_diff_s10.txt +Testing/Data/Symlink/Dir1/ss12_diff_s11.txt +Testing/Data/Symlink/Dir1/ss12_diff_s12.txt +Testing/Data/Symlink/Dir1/ss12_diff_s21.txt +Testing/Data/Symlink/Dir1/ss12_same_s00.txt +Testing/Data/Symlink/Dir1/ss12_same_s11.txt +Testing/Data/Symlink/Dir2/fs12_diff_s01.txt +Testing/Data/Symlink/Dir2/fs12_diff_s10.txt +Testing/Data/Symlink/Dir2/fs12_diff_s11.txt +Testing/Data/Symlink/Dir2/fs12_diff_s12.txt +Testing/Data/Symlink/Dir2/fs12_diff_s21.txt +Testing/Data/Symlink/Dir2/fs12_same_s00.txt +Testing/Data/Symlink/Dir2/fs12_same_s11.txt +Testing/Data/Symlink/Dir2/s2_s0.txt +Testing/Data/Symlink/Dir2/s2_s1.txt +Testing/Data/Symlink/Dir2/ss12_diff_s01.txt +Testing/Data/Symlink/Dir2/ss12_diff_s10.txt +Testing/Data/Symlink/Dir2/ss12_diff_s11.txt +Testing/Data/Symlink/Dir2/ss12_diff_s12.txt +Testing/Data/Symlink/Dir2/ss12_diff_s21.txt +Testing/Data/Symlink/Dir2/ss12_same_s00.txt +Testing/Data/Symlink/Dir2/ss12_same_s11.txt diff --git a/Src/CompareEngines/BinaryCompare.cpp b/Src/CompareEngines/BinaryCompare.cpp index f3cfc96624c..0ce3be160bf 100644 --- a/Src/CompareEngines/BinaryCompare.cpp +++ b/Src/CompareEngines/BinaryCompare.cpp @@ -54,8 +54,10 @@ static int compare_files(const String& file1, const String& file2, IAbortable *p { if (size1 < 0 || size2 < 0) code = DIFFCODE::CMPERR; - else + else if (size1 == size2) code = DIFFCODE::SAME; + else + code = DIFFCODE::DIFF; break; } if (size1 != size2 || memcmp(buf1, buf2, size1) != 0) @@ -87,12 +89,16 @@ int BinaryCompare::CompareFiles(const PathContext& files, const DIFFITEM &di) co switch (files.GetSize()) { case 2: - return di.diffFileInfo[0].size != di.diffFileInfo[1].size ? + // If the file size is 0, don't immediately assume that there is a difference even if the files have different sizes, because of possible symlinks. + return (di.diffFileInfo[0].size != di.diffFileInfo[1].size && + di.diffFileInfo[0].size != 0 && di.diffFileInfo[1].size != 0) ? DIFFCODE::DIFF : compare_files(files[0], files[1], m_piAbortable); case 3: - unsigned code10 = (di.diffFileInfo[1].size != di.diffFileInfo[0].size) ? + unsigned code10 = (di.diffFileInfo[1].size != di.diffFileInfo[0].size && + di.diffFileInfo[1].size != 0 && di.diffFileInfo[0].size != 0) ? DIFFCODE::DIFF : compare_files(files[1], files[0], m_piAbortable); - unsigned code12 = (di.diffFileInfo[1].size != di.diffFileInfo[2].size) ? + unsigned code12 = (di.diffFileInfo[1].size != di.diffFileInfo[2].size && + di.diffFileInfo[1].size != 0 && di.diffFileInfo[2].size != 0) ? DIFFCODE::DIFF : compare_files(files[1], files[2], m_piAbortable); unsigned code02 = DIFFCODE::SAME; if (code10 == DIFFCODE::SAME && code12 == DIFFCODE::SAME) @@ -103,7 +109,8 @@ int BinaryCompare::CompareFiles(const PathContext& files, const DIFFITEM &di) co return DIFFCODE::DIFF | DIFFCODE::DIFF1STONLY; else if (code10 == DIFFCODE::DIFF && code12 == DIFFCODE::DIFF) { - code02 = di.diffFileInfo[0].size != di.diffFileInfo[2].size ? + code02 = (di.diffFileInfo[0].size != di.diffFileInfo[2].size && + di.diffFileInfo[0].size != 0 && di.diffFileInfo[2].size != 0) ? DIFFCODE::DIFF : compare_files(files[0], files[2], m_piAbortable); if (code02 == DIFFCODE::SAME) return DIFFCODE::DIFF | DIFFCODE::DIFF2NDONLY; diff --git a/Testing/Data/Symlink/CreateSymlink.cmd b/Testing/Data/Symlink/CreateSymlink.cmd new file mode 100644 index 00000000000..2dcb69a4814 --- /dev/null +++ b/Testing/Data/Symlink/CreateSymlink.cmd @@ -0,0 +1,32 @@ +mklink %~dp0\Dir1\s1_s0.txt %~dp0\Dir1\f1_s0.txt +mklink %~dp0\Dir1\s1_s1.txt %~dp0\Dir1\f1_s1.txt +mklink %~dp0\Dir2\s2_s0.txt %~dp0\Dir2\f2_s0.txt +mklink %~dp0\Dir2\s2_s1.txt %~dp0\Dir2\f2_s1.txt +mklink %~dp0\Dir1\sf12_same_s00.txt %~dp0\Dir1\ff12_same_s00.txt +mklink %~dp0\Dir1\sf12_same_s11.txt %~dp0\Dir1\ff12_same_s11.txt +mklink %~dp0\Dir1\sf12_diff_s01.txt %~dp0\Dir1\ff12_diff_s01.txt +mklink %~dp0\Dir1\sf12_diff_s10.txt %~dp0\Dir1\ff12_diff_s10.txt +mklink %~dp0\Dir1\sf12_diff_s11.txt %~dp0\Dir1\ff12_diff_s11.txt +mklink %~dp0\Dir1\sf12_diff_s12.txt %~dp0\Dir1\ff12_diff_s12.txt +mklink %~dp0\Dir1\sf12_diff_s21.txt %~dp0\Dir1\ff12_diff_s21.txt +mklink %~dp0\Dir2\fs12_same_s00.txt %~dp0\Dir2\ff12_same_s00.txt +mklink %~dp0\Dir2\fs12_same_s11.txt %~dp0\Dir2\ff12_same_s11.txt +mklink %~dp0\Dir2\fs12_diff_s01.txt %~dp0\Dir2\ff12_diff_s01.txt +mklink %~dp0\Dir2\fs12_diff_s10.txt %~dp0\Dir2\ff12_diff_s10.txt +mklink %~dp0\Dir2\fs12_diff_s11.txt %~dp0\Dir2\ff12_diff_s11.txt +mklink %~dp0\Dir2\fs12_diff_s12.txt %~dp0\Dir2\ff12_diff_s12.txt +mklink %~dp0\Dir2\fs12_diff_s21.txt %~dp0\Dir2\ff12_diff_s21.txt +mklink %~dp0\Dir1\ss12_same_s00.txt %~dp0\Dir1\ff12_same_s00.txt +mklink %~dp0\Dir1\ss12_same_s11.txt %~dp0\Dir1\ff12_same_s11.txt +mklink %~dp0\Dir1\ss12_diff_s01.txt %~dp0\Dir1\ff12_diff_s01.txt +mklink %~dp0\Dir1\ss12_diff_s10.txt %~dp0\Dir1\ff12_diff_s10.txt +mklink %~dp0\Dir1\ss12_diff_s11.txt %~dp0\Dir1\ff12_diff_s11.txt +mklink %~dp0\Dir1\ss12_diff_s12.txt %~dp0\Dir1\ff12_diff_s12.txt +mklink %~dp0\Dir1\ss12_diff_s21.txt %~dp0\Dir1\ff12_diff_s21.txt +mklink %~dp0\Dir2\ss12_same_s00.txt %~dp0\Dir2\ff12_same_s00.txt +mklink %~dp0\Dir2\ss12_same_s11.txt %~dp0\Dir2\ff12_same_s11.txt +mklink %~dp0\Dir2\ss12_diff_s01.txt %~dp0\Dir2\ff12_diff_s01.txt +mklink %~dp0\Dir2\ss12_diff_s10.txt %~dp0\Dir2\ff12_diff_s10.txt +mklink %~dp0\Dir2\ss12_diff_s11.txt %~dp0\Dir2\ff12_diff_s11.txt +mklink %~dp0\Dir2\ss12_diff_s12.txt %~dp0\Dir2\ff12_diff_s12.txt +mklink %~dp0\Dir2\ss12_diff_s21.txt %~dp0\Dir2\ff12_diff_s21.txt diff --git a/Testing/Data/Symlink/Dir1/f1_s0.txt b/Testing/Data/Symlink/Dir1/f1_s0.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Testing/Data/Symlink/Dir1/f1_s1.txt b/Testing/Data/Symlink/Dir1/f1_s1.txt new file mode 100644 index 00000000000..8c7e5a667f1 --- /dev/null +++ b/Testing/Data/Symlink/Dir1/f1_s1.txt @@ -0,0 +1 @@ +A \ No newline at end of file diff --git a/Testing/Data/Symlink/Dir1/ff12_diff_s01.txt b/Testing/Data/Symlink/Dir1/ff12_diff_s01.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Testing/Data/Symlink/Dir1/ff12_diff_s10.txt b/Testing/Data/Symlink/Dir1/ff12_diff_s10.txt new file mode 100644 index 00000000000..8c7e5a667f1 --- /dev/null +++ b/Testing/Data/Symlink/Dir1/ff12_diff_s10.txt @@ -0,0 +1 @@ +A \ No newline at end of file diff --git a/Testing/Data/Symlink/Dir1/ff12_diff_s11.txt b/Testing/Data/Symlink/Dir1/ff12_diff_s11.txt new file mode 100644 index 00000000000..8c7e5a667f1 --- /dev/null +++ b/Testing/Data/Symlink/Dir1/ff12_diff_s11.txt @@ -0,0 +1 @@ +A \ No newline at end of file diff --git a/Testing/Data/Symlink/Dir1/ff12_diff_s12.txt b/Testing/Data/Symlink/Dir1/ff12_diff_s12.txt new file mode 100644 index 00000000000..8c7e5a667f1 --- /dev/null +++ b/Testing/Data/Symlink/Dir1/ff12_diff_s12.txt @@ -0,0 +1 @@ +A \ No newline at end of file diff --git a/Testing/Data/Symlink/Dir1/ff12_diff_s21.txt b/Testing/Data/Symlink/Dir1/ff12_diff_s21.txt new file mode 100644 index 00000000000..dfc91791b27 --- /dev/null +++ b/Testing/Data/Symlink/Dir1/ff12_diff_s21.txt @@ -0,0 +1 @@ +AB \ No newline at end of file diff --git a/Testing/Data/Symlink/Dir1/ff12_same_s00.txt b/Testing/Data/Symlink/Dir1/ff12_same_s00.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Testing/Data/Symlink/Dir1/ff12_same_s11.txt b/Testing/Data/Symlink/Dir1/ff12_same_s11.txt new file mode 100644 index 00000000000..8c7e5a667f1 --- /dev/null +++ b/Testing/Data/Symlink/Dir1/ff12_same_s11.txt @@ -0,0 +1 @@ +A \ No newline at end of file diff --git a/Testing/Data/Symlink/Dir1/fs12_diff_s01.txt b/Testing/Data/Symlink/Dir1/fs12_diff_s01.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Testing/Data/Symlink/Dir1/fs12_diff_s10.txt b/Testing/Data/Symlink/Dir1/fs12_diff_s10.txt new file mode 100644 index 00000000000..8c7e5a667f1 --- /dev/null +++ b/Testing/Data/Symlink/Dir1/fs12_diff_s10.txt @@ -0,0 +1 @@ +A \ No newline at end of file diff --git a/Testing/Data/Symlink/Dir1/fs12_diff_s11.txt b/Testing/Data/Symlink/Dir1/fs12_diff_s11.txt new file mode 100644 index 00000000000..8c7e5a667f1 --- /dev/null +++ b/Testing/Data/Symlink/Dir1/fs12_diff_s11.txt @@ -0,0 +1 @@ +A \ No newline at end of file diff --git a/Testing/Data/Symlink/Dir1/fs12_diff_s12.txt b/Testing/Data/Symlink/Dir1/fs12_diff_s12.txt new file mode 100644 index 00000000000..8c7e5a667f1 --- /dev/null +++ b/Testing/Data/Symlink/Dir1/fs12_diff_s12.txt @@ -0,0 +1 @@ +A \ No newline at end of file diff --git a/Testing/Data/Symlink/Dir1/fs12_diff_s21.txt b/Testing/Data/Symlink/Dir1/fs12_diff_s21.txt new file mode 100644 index 00000000000..dfc91791b27 --- /dev/null +++ b/Testing/Data/Symlink/Dir1/fs12_diff_s21.txt @@ -0,0 +1 @@ +AB \ No newline at end of file diff --git a/Testing/Data/Symlink/Dir1/fs12_same_s00.txt b/Testing/Data/Symlink/Dir1/fs12_same_s00.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Testing/Data/Symlink/Dir1/fs12_same_s11.txt b/Testing/Data/Symlink/Dir1/fs12_same_s11.txt new file mode 100644 index 00000000000..8c7e5a667f1 --- /dev/null +++ b/Testing/Data/Symlink/Dir1/fs12_same_s11.txt @@ -0,0 +1 @@ +A \ No newline at end of file diff --git a/Testing/Data/Symlink/Dir2/f2_s0.txt b/Testing/Data/Symlink/Dir2/f2_s0.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Testing/Data/Symlink/Dir2/f2_s1.txt b/Testing/Data/Symlink/Dir2/f2_s1.txt new file mode 100644 index 00000000000..7371f47a6f8 --- /dev/null +++ b/Testing/Data/Symlink/Dir2/f2_s1.txt @@ -0,0 +1 @@ +B \ No newline at end of file diff --git a/Testing/Data/Symlink/Dir2/ff12_diff_s01.txt b/Testing/Data/Symlink/Dir2/ff12_diff_s01.txt new file mode 100644 index 00000000000..8c7e5a667f1 --- /dev/null +++ b/Testing/Data/Symlink/Dir2/ff12_diff_s01.txt @@ -0,0 +1 @@ +A \ No newline at end of file diff --git a/Testing/Data/Symlink/Dir2/ff12_diff_s10.txt b/Testing/Data/Symlink/Dir2/ff12_diff_s10.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Testing/Data/Symlink/Dir2/ff12_diff_s11.txt b/Testing/Data/Symlink/Dir2/ff12_diff_s11.txt new file mode 100644 index 00000000000..7371f47a6f8 --- /dev/null +++ b/Testing/Data/Symlink/Dir2/ff12_diff_s11.txt @@ -0,0 +1 @@ +B \ No newline at end of file diff --git a/Testing/Data/Symlink/Dir2/ff12_diff_s12.txt b/Testing/Data/Symlink/Dir2/ff12_diff_s12.txt new file mode 100644 index 00000000000..dfc91791b27 --- /dev/null +++ b/Testing/Data/Symlink/Dir2/ff12_diff_s12.txt @@ -0,0 +1 @@ +AB \ No newline at end of file diff --git a/Testing/Data/Symlink/Dir2/ff12_diff_s21.txt b/Testing/Data/Symlink/Dir2/ff12_diff_s21.txt new file mode 100644 index 00000000000..7371f47a6f8 --- /dev/null +++ b/Testing/Data/Symlink/Dir2/ff12_diff_s21.txt @@ -0,0 +1 @@ +B \ No newline at end of file diff --git a/Testing/Data/Symlink/Dir2/ff12_same_s00.txt b/Testing/Data/Symlink/Dir2/ff12_same_s00.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Testing/Data/Symlink/Dir2/ff12_same_s11.txt b/Testing/Data/Symlink/Dir2/ff12_same_s11.txt new file mode 100644 index 00000000000..8c7e5a667f1 --- /dev/null +++ b/Testing/Data/Symlink/Dir2/ff12_same_s11.txt @@ -0,0 +1 @@ +A \ No newline at end of file diff --git a/Testing/Data/Symlink/Dir2/sf12_diff_s01.txt b/Testing/Data/Symlink/Dir2/sf12_diff_s01.txt new file mode 100644 index 00000000000..8c7e5a667f1 --- /dev/null +++ b/Testing/Data/Symlink/Dir2/sf12_diff_s01.txt @@ -0,0 +1 @@ +A \ No newline at end of file diff --git a/Testing/Data/Symlink/Dir2/sf12_diff_s10.txt b/Testing/Data/Symlink/Dir2/sf12_diff_s10.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Testing/Data/Symlink/Dir2/sf12_diff_s11.txt b/Testing/Data/Symlink/Dir2/sf12_diff_s11.txt new file mode 100644 index 00000000000..7371f47a6f8 --- /dev/null +++ b/Testing/Data/Symlink/Dir2/sf12_diff_s11.txt @@ -0,0 +1 @@ +B \ No newline at end of file diff --git a/Testing/Data/Symlink/Dir2/sf12_diff_s12.txt b/Testing/Data/Symlink/Dir2/sf12_diff_s12.txt new file mode 100644 index 00000000000..dfc91791b27 --- /dev/null +++ b/Testing/Data/Symlink/Dir2/sf12_diff_s12.txt @@ -0,0 +1 @@ +AB \ No newline at end of file diff --git a/Testing/Data/Symlink/Dir2/sf12_diff_s21.txt b/Testing/Data/Symlink/Dir2/sf12_diff_s21.txt new file mode 100644 index 00000000000..7371f47a6f8 --- /dev/null +++ b/Testing/Data/Symlink/Dir2/sf12_diff_s21.txt @@ -0,0 +1 @@ +B \ No newline at end of file diff --git a/Testing/Data/Symlink/Dir2/sf12_same_s00.txt b/Testing/Data/Symlink/Dir2/sf12_same_s00.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Testing/Data/Symlink/Dir2/sf12_same_s11.txt b/Testing/Data/Symlink/Dir2/sf12_same_s11.txt new file mode 100644 index 00000000000..8c7e5a667f1 --- /dev/null +++ b/Testing/Data/Symlink/Dir2/sf12_same_s11.txt @@ -0,0 +1 @@ +A \ No newline at end of file