svn commit: r989101 - /subversion/trunk/subversion/tests/cmdline/merge_tests.py

[rh...@apache.org]

Author: rhuijben
Date: Wed Aug 25 13:31:12 2010
New Revision: 989101

URL: http://svn.apache.org/viewvc?rev=989101&view=rev
Log:
Fix a new merge test on windows (merge 112: merge into locally added
directory), by handling text files as binary to avoid mixing eol styles.

* subversion/tests/cmdline/merge_tests.py
  (merge_into_locally_added_directory): Use file_append_binary instead of
    file_append.

Modified:
    subversion/trunk/subversion/tests/cmdline/merge_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=989101&r1=989100&r2=989101&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Wed Aug 25 13:31:12 2010
@@ -15822,16 +15822,16 @@ def merge_into_locally_added_directory(s
   pi_path = sbox.ospath("A/D/G/pi")
   new_dir_path = sbox.ospath("A/D/new_dir")
 
-  svntest.main.file_append(pi_path, "foo\n")
+  svntest.main.file_append_binary(pi_path, "foo\n")
   sbox.simple_commit(); # r2
 
   os.mkdir(new_dir_path)
-  svntest.main.file_append(os.path.join(new_dir_path, 'pi'),
-                           "This is the file 'pi'.\n")
-  svntest.main.file_append(os.path.join(new_dir_path, 'rho'),
-                           "This is the file 'rho'.\n")
-  svntest.main.file_append(os.path.join(new_dir_path, 'tau'),
-                           "This is the file 'tau'.\n")
+  svntest.main.file_append_binary(os.path.join(new_dir_path, 'pi'),
+                                  "This is the file 'pi'.\n")
+  svntest.main.file_append_binary(os.path.join(new_dir_path, 'rho'),
+                                  "This is the file 'rho'.\n")
+  svntest.main.file_append_binary(os.path.join(new_dir_path, 'tau'),
+                                  "This is the file 'tau'.\n")
   sbox.simple_add(new_dir_path)
 
   expected_output = wc.State(wc_dir, {