我正在创建一个svn diff补丁,但似乎图像文件没有被包含在内。对于每个图像文件,补丁包含类似的行,如下所示:
Index: crimgeoprofile/code/jquery/css/ui-lightness/images/animated-overlay.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: crimgeoprofile/code/jquery/css/ui-lightness/images/animated-overlay.gif
===================================================================
--- crimgeoprofile/code/jquery/css/ui-lightness/images/animated-overlay.gif (revision 1510040)
+++ crimgeoprofile/code/jquery/css/ui-lightness/images/animated-overlay.gif (working copy)
我正在使用以下命令创建补丁:
svn diff > test.diff
有没有关于如何包含图片文件的建议将不胜感激。
svn diff --git
而不是普通的svn diff
来生成这样的补丁。 - Bert Huijben--git
,它也拒绝对二进制文件进行差异比较。 - npostavs