diff options
Diffstat (limited to 'subversion/tests/cmdline/tree_conflict_tests.py')
| -rwxr-xr-x | subversion/tests/cmdline/tree_conflict_tests.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/subversion/tests/cmdline/tree_conflict_tests.py b/subversion/tests/cmdline/tree_conflict_tests.py index 61f3231..3edd00a 100755 --- a/subversion/tests/cmdline/tree_conflict_tests.py +++ b/subversion/tests/cmdline/tree_conflict_tests.py @@ -1518,7 +1518,7 @@ def local_missing_dir_endless_loop(sbox): sbox.simple_move('A/B', 'A/B2') sbox.simple_commit() sbox.simple_update() - main.file_append_binary(sbox.ospath("A/B2/lambda"), "This is more content.\n") + main.file_append(sbox.ospath("A/B2/lambda"), "This is more content.\n") sbox.simple_commit() sbox.simple_update() @@ -1541,7 +1541,7 @@ interactive-conflicts = true # If everything works as expected the resolver will recommended a # resolution option and 'svn' will resolve the conflict automatically. # Verify that 'A1/B/lambda' contains the merged content: - contents = open(sbox.ospath('A1/B/lambda'), 'rb').readlines() + contents = open(sbox.ospath('A1/B/lambda'), 'r').readlines() svntest.verify.compare_and_display_lines( "A1/B/lambda has unexpectected contents", sbox.ospath("A1/B/lambda"), [ "This is the file 'lambda'.\n", "This is more content.\n"], contents) |