You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2016/02/21 14:39:12 UTC
svn commit: r1731531 -
/subversion/trunk/subversion/tests/cmdline/patch_tests.py
Author: rhuijben
Date: Sun Feb 21 13:39:12 2016
New Revision: 1731531
URL: http://svn.apache.org/viewvc?rev=1731531&view=rev
Log:
* subversion/libsvn_diff/diff_file.c
(patch_merge): Update expected result to show the problem and mark XFail.
Modified:
subversion/trunk/subversion/tests/cmdline/patch_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/patch_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/patch_tests.py?rev=1731531&r1=1731530&r2=1731531&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/patch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/patch_tests.py Sun Feb 21 13:39:12 2016
@@ -7679,6 +7679,7 @@ def patch_missed_trail(sbox):
expected_output, expected_disk,
expected_status, expected_skip)
+@XFail()
def patch_merge(sbox):
"patching a specific merge"
@@ -7741,6 +7742,9 @@ def patch_merge(sbox):
expected_output, None,
None, expected_skip)
+ # Currently we see D E F doubled, that is certainly bad behavior.
+ # I could imaging that just applying the 'C' line change would be ok,
+ # but most likely a text conflict is the proper thing to do here.
expected_disk = svntest.main.greek_state.copy()
expected_disk.add({
'new.txt' : Item(contents='A\n'
@@ -7749,9 +7753,9 @@ def patch_merge(sbox):
'D\n'
'E\n'
'F\n'
- 'D\n'
- 'E\n'
- 'F\n'
+ #'D\n' # Doubled???
+ #'E\n' # Doubled???
+ #'F\n' # Doubled???
'J\n'
'K\n'
'L')})