Bug #63697 [PATCH]: 'Download diff as a patch' doesn't consider trailing spaces changes
| From: | shein@php.net | Date: | Tue, 25 Dec 2012 14:05:45 +0000 |
| Subject: | Bug #63697 [PATCH]: 'Download diff as a patch' doesn't consider trailing spaces changes | ||
| References: | 1 | Groups: | php.doc.bugs |
| Request: | Send a blank email to doc-bugs+get-9317@lists.php.net to get a copy of this message | ||
Edit report at https://bugs.php.net/bug.php?id=63697&edit=1
ID: 63697
Patch added by: shein@php.net
Reported by: shein@php.net
Summary: 'Download diff as a patch' doesn't consider trailing
spaces changes
Status: Open
Type: Bug
Package: Online Doc Editor problem
Operating System: Ubuntu 12.10 64-bit
PHP Version: Irrelevant
Block user comment: N
Private report: N
New Comment:
The following patch has been added/updated:
Patch Name: exec-to-passthru
Revision: 1356444345
URL: https://bugs.php.net/patch-display.php?bug=63697&patch=exec-to-passthru&revision=1356444345
Previous Comments:
------------------------------------------------------------------------
[2012-12-05 12:17:35] shein@php.net
Description:
------------
The tool generates incorrect patches when patch contains lines that diff only in
trailing spaces, for example, in this patch: https://edit.php.net/index.php?
patch=ru/features/cookies.xml&project=PHP
original line
"когда вклÑÑена диÑекÑива
<link linkend="ini.track-vars">track_vars</link>."
should contain trailing space, while patched line doesn't. As you can see in the
patch lines are identical - this makes patch(1) reject these hunks.
In Expected/Actual result sections I enabled "End-of-line" mode, so it's easier
to spot trailing spaces.
Expected result:
----------------
conf@conf ~/Downloads $ cat -E patch-1354692276.patch
--- ru/features/cookies.xml$
+++ ru/features/cookies.xml$
@@ -1,6 +1,6 @@$
<?xml version="1.0" encoding="utf-8"?>$
<!-- EN-Revision: 297028 Maintainer: shein Status: ready -->$
-<!-- Reviewed: no -->$
+<!-- Reviewed: yes Maintainer: Alex Cooper -->$
<!-- $Revision: 325754 $ -->$
<chapter xml:id="features.cookies" xmlns="http://docbook.org/ns/docbook">$
<title>Cookies</title>$
@@ -35,7 +35,7 @@$
ÑÑÑ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ, Ñак как
она обÑÑно оÑклÑÑена в ÑелÑÑ
безопаÑноÑÑи.$
Рболее ÑанниÑ
веÑÑиÑÑ
Ñакже опÑеделÑеÑÑÑ Ð¼Ð°ÑÑив$
<varname>$HTTP_COOKIE_VARS</varname>, но ÑолÑко$
- когда вклÑÑена диÑекÑива
<link linkend="ini.track-vars">track_vars</link>. $
+ когда вклÑÑена диÑекÑива
<link linkend="ini.track-vars">track_vars</link>.$
(ÐÑа диÑекÑива вÑегда
вклÑÑена наÑÐ¸Ð½Ð°Ñ Ñ Ð²ÐµÑÑии PHP
4.0.3.)$
</para>$
Actual result:
--------------
conf@conf ~/Downloads $ cat -E patch-1354692276.patch
--- ru/features/cookies.xml$
+++ ru/features/cookies.xml$
@@ -1,6 +1,6 @@$
<?xml version="1.0" encoding="utf-8"?>$
<!-- EN-Revision: 297028 Maintainer: shein Status: ready -->$
-<!-- Reviewed: no -->$
+<!-- Reviewed: yes Maintainer: Alex Cooper -->$
<!-- $Revision: 325754 $ -->$
<chapter xml:id="features.cookies" xmlns="http://docbook.org/ns/docbook">$
<title>Cookies</title>$
@@ -35,7 +35,7 @@$
ÑÑÑ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ, Ñак как
она обÑÑно оÑклÑÑена в ÑелÑÑ
безопаÑноÑÑи.$
Рболее ÑанниÑ
веÑÑиÑÑ
Ñакже опÑеделÑеÑÑÑ Ð¼Ð°ÑÑив$
<varname>$HTTP_COOKIE_VARS</varname>, но ÑолÑко$
- когда вклÑÑена диÑекÑива
<link linkend="ini.track-vars">track_vars</link>.$
+ когда вклÑÑена диÑекÑива
<link linkend="ini.track-vars">track_vars</link>.$
(ÐÑа диÑекÑива вÑегда
вклÑÑена наÑÐ¸Ð½Ð°Ñ Ñ Ð²ÐµÑÑии PHP
4.0.3.)$
</para>$
------------------------------------------------------------------------
--
Edit this bug report at https://bugs.php.net/bug.php?id=63697&edit=1