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

[pb...@apache.org]

Author: pburba
Date: Fri Feb  1 17:49:26 2013
New Revision: 1441556

URL: http://svn.apache.org/viewvc?rev=1441556&view=rev
Log:
Add a dose of common sense to test for issue #4306 'multiple editor drive
file merges record wrong mergeinfo during conflicts'

* subversion/tests/cmdline/merge_tests.py

  (conflict_aborted_mergeinfo_described_partial_merge): Add line endings
   as we append text to a file.  This doesn't actually effect the test,
   but makes it a bit easy to follow if one is playing around with the
   resulting WC.

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=1441556&r1=1441555&r2=1441556&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Fri Feb  1 17:49:26 2013
@@ -18198,15 +18198,15 @@ def conflict_aborted_mergeinfo_described
   sbox.simple_commit()
 
   # r3
-  sbox.simple_append('iota', 'new line in r3')
+  sbox.simple_append('iota', 'new line in r3\n')
   sbox.simple_commit()
 
   # r4
-  sbox.simple_append('iota', 'new line in r4')
+  sbox.simple_append('iota', 'new line in r4\n')
   sbox.simple_commit()
 
   # r5
-  sbox.simple_append('iota', 'new line in r5')
+  sbox.simple_append('iota', 'new line in r5\n')
   sbox.simple_commit()
 
   # r6 Merge r4 from iota to iota-moved