4750: SVN 1.10 binary file not showing up DIFF file list

totoroliu

What version are you running?

ReviewBoard 2.5.17

What's the URL of the page containing the problem?

/r/#######/diff/1#index_header

What steps will reproduce the problem?

  1. Use SVN 1.10 to create a change containing binary file
  2. rbt post

What is the expected output? What do you see instead?

When using SVN 1.9,
the DIFF page would still show the binary file name in the file list,
and the DIFF section would show "This is a binary file. The content cannot be displayed.
But when using SVN 1.10,
the binary file name can't be found on DIFF page at all.

What operating system are you using? What browser?

Ubuntu 16.04
Chromium 69.0.3497.81

Please provide any additional information below.

the binary file "svn diff" output is differnet between SVN 1.9 and SVN 1.10:

SVN 1.9:

Index: /binary1

Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: /binary1
===================================================================
--- /binary1 (nonexistent)
+++ /binary1 (working copy)

Property changes on: /binary1


Added: svn:mime-type

-0,0 +1

+application/octet-stream
\ No newline at end of property

SVN 1.10:
Index: /binary1
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: /binary1


Added: svn:mime-type

-0,0 +1

+application/octet-stream
\ No newline at end of property

totoroliu
#1 totoroliu

With SVN 1.10,
if the DIFF file has mixed of text file change and binary file change,
rbt patch would incorrectly patch text file change with binary file svn property
and caused SVN property conflicts.