Community
Participate
Working Groups
Not sure if this is a bug or my lack of understanding... I created a patch for a change which included new *.gif files. The patch file that was created did not include the contents of the new gif files (though it did include a reference to the new files: Index: icons/basic/wizban/saveas_dlg.gif =================================================================== RCS file: icons/basic/wizban/saveas_dlg.gif diff -N icons/basic/wizban/saveas_dlg.gif Binary files /dev/null and saveas_dlg.gif differ Index: icons/full/wizban/saveas_dlg.gif =================================================================== RCS file: icons/full/wizban/saveas_dlg.gif diff -N icons/full/wizban/saveas_dlg.gif Binary files /dev/null and saveas_dlg.gif differ How does one create a patch that includes new binary files such that the file contents are part of the patch?
The standard (CVS) diff/patch tools are typically used only with source code. For binary files (like image resources *.gif etc.) CVS patch reports only that two files differ but doesn't tell you how they differ. It is possible to force CVS diff to treat binary files as text and produce a line by line comparison. However because lines can be very long if they don't contain any line separators, shipping these patches and applying them with the 'patch' command is not recommended because it does not work reliable. So as long as we are using the CVS diff (as 'Team/Create Patch...' in the context menu) we cannot deal with arbitrary binary resources. However it is planned to change that when we use our own version of diff which is independent from CVS (see #6838) and extends the patch format for binary files. Lowered the priority and added dependency on #6838
not for 2.0
As of now 'LATER' and 'REMIND' resolutions are no longer supported. Please reopen this bug if it is still valid for you.