Author: svn-role
Date: Sat Dec 19 04:00:18 2020
New Revision: 1884618

URL: http://svn.apache.org/viewvc?rev=1884618&view=rev
Log:
Merge the r1881985 group from trunk:

 * r1881985, r1882105
   Follow up to r1880192: Fix an EOL issue in test on Windows.
   Justification:
     We should test correctly on Windows environment, too.
   Depends:
     r1880192
   Votes:
     +1: futatuki, jcorvel, hartmannathan

Modified:
    subversion/branches/1.14.x/   (props changed)
    subversion/branches/1.14.x/STATUS
    subversion/branches/1.14.x/subversion/tests/cmdline/merge_tests.py

Propchange: subversion/branches/1.14.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1881985,1882105

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1884618&r1=1884617&r2=1884618&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sat Dec 19 04:00:18 2020
@@ -52,12 +52,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1881985, r1882105
-   Follow up to r1880192: Fix an EOL issue in test on Windows.
-   Justification:
-     We should test correctly on Windows environment, too.
-   Depends:
-     r1880192
-   Votes:
-     +1: futatuki, jcorvel, hartmannathan

Modified: subversion/branches/1.14.x/subversion/tests/cmdline/merge_tests.py
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/tests/cmdline/merge_tests.py?rev=1884618&r1=1884617&r2=1884618&view=diff
==============================================================================
--- subversion/branches/1.14.x/subversion/tests/cmdline/merge_tests.py 
(original)
+++ subversion/branches/1.14.x/subversion/tests/cmdline/merge_tests.py Sat Dec 
19 04:00:18 2020
@@ -18639,11 +18639,18 @@ def merge_deleted_folder_with_mergeinfo_
                                        )
 
   # verify that mergeinfo is set/changed on A/D, A/D/G, A/D/G2.
+
+  # NOTE: When writing out multi-line prop values in svn:* props, the
+  # client converts to local encoding and local eol style.
+  # Therefore, the expected output must contain the right kind of eoln
+  # strings. That's why we use os.linesep in the tests below, not just
+  # plain '\n'.
+
   expected_mergeinfo = [
     ('A',       ['/branch_A:3-7']),
-    ('A/D',     ['/branch_A/D:5-7\n', '/branch_B/C:1*']),
-    ('A/D/G',   ['/branch_A/D/G:5-7\n', '/branch_B/C/G:1*']),
-    ('A/D/G2',  ['/branch_A/D/G2:5-7\n', '/branch_B/C/G2:1*']),
+    ('A/D',     ['/branch_A/D:5-7'+os.linesep, '/branch_B/C:1*']),
+    ('A/D/G',   ['/branch_A/D/G:5-7'+os.linesep, '/branch_B/C/G:1*']),
+    ('A/D/G2',  ['/branch_A/D/G2:5-7'+os.linesep, '/branch_B/C/G2:1*']),
     ]
   for path, mergeinfo in expected_mergeinfo:
     svntest.actions.check_prop('svn:mergeinfo', sbox.ospath(path),


Reply via email to