svn commit: r1706111 - in /subversion/branches/patch-exec/subversion: libsvn_diff/parse-diff.c tests/cmdline/patch_tests.py

[da...@apache.org]

Author: danielsh
Date: Wed Sep 30 18:19:31 2015
New Revision: 1706111

URL: http://svn.apache.org/viewvc?rev=1706111&view=rev
Log:
* /branches/patch-exec: Revert unintentional part of r1706110.

Modified:
    subversion/branches/patch-exec/subversion/libsvn_diff/parse-diff.c
    subversion/branches/patch-exec/subversion/tests/cmdline/patch_tests.py

Modified: subversion/branches/patch-exec/subversion/libsvn_diff/parse-diff.c
URL: http://svn.apache.org/viewvc/subversion/branches/patch-exec/subversion/libsvn_diff/parse-diff.c?rev=1706111&r1=1706110&r2=1706111&view=diff
==============================================================================
--- subversion/branches/patch-exec/subversion/libsvn_diff/parse-diff.c (original)
+++ subversion/branches/patch-exec/subversion/libsvn_diff/parse-diff.c Wed Sep 30 18:19:31 2015
@@ -2032,7 +2032,6 @@ static struct transition transitions[] =
 
   {"GIT binary patch",  state_git_diff_seen,    binary_patch_start},
   {"GIT binary patch",  state_git_tree_seen,    binary_patch_start},
-  {"GIT binary patch",  state_git_mode_seen,    binary_patch_start},
 };
 
 svn_error_t *

Modified: subversion/branches/patch-exec/subversion/tests/cmdline/patch_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/patch-exec/subversion/tests/cmdline/patch_tests.py?rev=1706111&r1=1706110&r2=1706111&view=diff
==============================================================================
--- subversion/branches/patch-exec/subversion/tests/cmdline/patch_tests.py (original)
+++ subversion/branches/patch-exec/subversion/tests/cmdline/patch_tests.py Wed Sep 30 18:19:31 2015
@@ -5657,21 +5657,14 @@ def patch_binary_file(sbox):
   sbox.simple_revert('iota')
 
   tmp = sbox.get_tempname()
-  patch = diff_output[:]
-  patch[3:3] = [
-    "old mode 100644\n",
-    "new mode 100755\n",
-    #"index ...\n",
-  ]
-  svntest.main.file_write(tmp, ''.join(patch))
+  svntest.main.file_write(tmp, ''.join(diff_output))
 
   expected_output = wc.State(wc_dir, {
     'iota'              : Item(status='UU'),
   })
   expected_disk = svntest.main.greek_state.copy()
   expected_disk.tweak('iota',
-                      props={'svn:mime-type':'application/binary',
-                             'svn:executable': '*'},
+                      props={'svn:mime-type':'application/binary'},
                       contents =
                       'This is the file \'iota\'.\n'
                       '\0\202\203\204\205\206\207nsomething\nelse\xFF')