Bug #60526 [Com]: Defect "Download unified diff as a patch"

Edit report at https://bugs.php.net/bug.php?id=60526&edit=1 ID: 60526 Comment by: irker@php.net Reported by: jakoch at web dot de Summary: Defect "Download unified diff as a patch" Status: Closed Type: Bug Package: Online Doc Editor problem PHP Version: Irrelevant Assigned To: yannick Block user comment: N Private report: N New Comment: Try it now, please. Previous Comments: ------------------------------------------------------------------------ [2012-02-11 16:02:04] irker@php.net We have some issue with rsync on edit.php.net. So phpdoe now not sync with repository. Please wait until we fix it. ------------------------------------------------------------------------ [2012-02-11 14:17:44] jakoch at web dot de No. Downloaded file is still empty. ------------------------------------------------------------------------ [2012-02-11 11:08:33] irker@php.net I added "-N" option to diff command, it's work for directories and files, so it's work now. This is what you need? ------------------------------------------------------------------------ [2011-12-22 06:06:33] yannick@php.net Yes, you're not in the right class. The diff here is on this file : https://svn.php.net/repository/web/doc- editor/trunk/php/File.php in method rawDiff() We can't compare directory as your suggestion. We must find a way to compare only files. And diff unix command need two files or directory as arguments. Perhaps adding a tmp file to compare with new file. ------------------------------------------------------------------------ [2011-12-22 01:26:08] jakoch at web dot de Hi Yannick, i took a quick glance at the PHP SVN directory for the doc-editor. Well, the function diff uses "svn diff" there. Haven't tracked this down and maybe i'm in the wrong file (https://svn.php.net/repository/web/doc-editor/trunk/php/SvnClient.php) ? Anyway, you might try adding the parameter "-N" for --new-file to the unix diff cmd. That will take take any new files in directories into account. There is also "-P" which will take new files in the second folder into account. So it's either diff -aN original/ new/ > original.patch or diff -aP original/ new/ > original.patch Please test :) Regards, Jens ------------------------------------------------------------------------ The remainder of the comments for this report are too long. To view the rest of the comments, please view the bug report online at https://bugs.php.net/bug.php?id=60526 -- Edit this bug report at https://bugs.php.net/bug.php?id=60526&edit=1