You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2018/09/23 09:58:59 UTC
svn commit: r1841736 -
/subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
Author: stsp
Date: Sun Sep 23 09:58:59 2018
New Revision: 1841736
URL: http://svn.apache.org/viewvc?rev=1841736&view=rev
Log:
* subversion/cmdline/tree_conflict_tests.py
(local_missing_dir_endless_loop): Remove a trailing newline to hopefully
make this test pass on Windows.
Modified:
subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py?rev=1841736&r1=1841735&r2=1841736&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py Sun Sep 23 09:58:59 2018
@@ -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(sbox.ospath("A/B2/lambda"), "This is more content.\n")
+ main.file_append(sbox.ospath("A/B2/lambda"), "This is more content.")
sbox.simple_commit()
sbox.simple_update()
@@ -1544,7 +1544,7 @@ interactive-conflicts = true
contents = open(sbox.ospath('A1/B/lambda'), 'rb').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)
+ [ "This is the file 'lambda'.\n", "This is more content."], contents)
#######################################################################