X-Cart:To apply a patch manually - Revision history

Seyfin: /* What is diff file? */

2011-10-01T07:40:54Z

‎What is diff file?

Seyfin: /* What is diff file? */

2011-07-27T04:32:19Z

‎What is diff file?

Seyfin: /* What is diff file? */

2011-07-27T04:31:45Z

‎What is diff file?

Seyfin at 08:01, 26 July 2011

2011-07-26T08:01:05Z

Seyfin: /* What is diff file? */

2011-07-25T16:20:45Z

‎What is diff file?

Seyfin: /* What is diff file? */

2011-07-25T16:02:17Z

‎What is diff file?

Seyfin at 11:36, 25 May 2011

2011-05-25T11:36:25Z

Seyfin: /* Understanding the process */

2011-05-25T11:30:15Z

‎Understanding the process

Seyfin at 11:20, 25 May 2011

2011-05-25T11:20:47Z

Vladimir Gurinenko at 07:15, 20 May 2011

2011-05-20T07:15:03Z

@@ Line 1: / Line 1: @@
-==What is diff file?==
+==What is diff (patch) file?==
-[http://en.wikipedia.org/wiki/Diff Diff] is a file that displays the changes made per line for text files, and in particular, for X-Cart source files.
+[http://en.wikipedia.org/wiki/Diff Diff] (or patch) is a file that displays the changes made per line for text files, and in particular, for X-Cart source files.
 Diff can include changes for several files. The name of each modified file is specified under a header line that may look something like this:

@@ Line 3: / Line 3: @@
 [http://en.wikipedia.org/wiki/Diff Diff] is a file that displays the changes made per line for text files, and in particular, for X-Cart source files.
-Diff can include changes for several files, the name of each modified file is specified under a header line that may look something like this:
+Diff can include changes for several files. The name of each modified file is specified under a header line that may look something like this:
 <pre>Index: include/func/func.category.php</pre>

@@ Line 1: / Line 1: @@
 ==What is diff file?==
-[http://en.wikipedia.org/wiki/Diff Diff] is a file that displays the changes made per line for X-Cart source files.
+[http://en.wikipedia.org/wiki/Diff Diff] is a file that displays the changes made per line for text files, and in particular, for X-Cart source files.
 Diff can include changes for several files, the name of each modified file is specified under a header line that may look something like this:

@@ Line 31: / Line 31: @@
 @@ -585,9 +585,7 @@
-     $cat = abs(intval($cat));
+$cat = abs(intval($cat));
 -    $to_search =
@@ Line 38: / Line 38: @@
 +    $to_search = $search_condition = $join_tbl = array();
-     $from = "$sql_tbl[categories] AS node ";
+$from = "$sql_tbl[categories] AS node ";
 @@ -942,8 +940,7 @@
-          'c.rpos'
+'c.rpos'
-     );
+);
 -    $search_condition =
@@ Line 48: / Line 48: @@
 +    $search_condition = $join_tbl = array();
-     if ($current_area == 'A' || $current_area == 'P') {
+if ($current_area == 'A' || $current_area == 'P') {
 </pre>
@@ Line 118: / Line 118: @@
 <pre>
 @@ -942,8 +940,7 @@
-          'c.rpos'
+'c.rpos'
-     );
+);
 -    $search_condition =
@@ Line 125: / Line 125: @@
 +    $search_condition = $join_tbl = array();
-     if ($current_area == 'A' || $current_area == 'P') {
+if ($current_area == 'A' || $current_area == 'P') {
 </pre>
@@ Line 131: / Line 131: @@
 <pre>
-          'c.rpos'
+'c.rpos'
-     );
+);
-     $search_condition =
+$search_condition =
-     $join_tbl = array();
+$join_tbl = array();
-     if ($current_area == 'A' || $current_area == 'P') {
+if ($current_area == 'A' || $current_area == 'P') {
 </pre>
@@ Line 144: / Line 144: @@
 <pre>
-          'c.rpos'
+'c.rpos'
-     );
+);
-     $search_condition = $join_tbl = array();
+$search_condition = $join_tbl = array();
-     if ($current_area == 'A' || $current_area == 'P') {
+if ($current_area == 'A' || $current_area == 'P') {
 </pre>
@@ Line 155: / Line 155: @@
 The built-in patch/upgrade utility basically works in the same way.
 [[Category:X-Cart user manual]]
 [[Category:X-Cart user manual]]

@@ Line 7: / Line 7: @@
 <pre>Index: include/func/func.category.php</pre>
-Each header line is then followed with one or several [http://en.wikipedia.org/wiki/Hunk "hunks"]. Each "hunk" starts with a line like this:
+The above header line indicates that the diff displays the changes for <xcart_dir>/include/func/func.category.php file.
 <pre>@@ -942,8 +940,7 @@</pre>

@@ Line 122: / Line 122: @@
 </pre>
-* Original code to search for (around the line 942):
+* Original code to search for (8 lines of code around the line 942):
 <pre>
-line 942:        'c.rpos'
+        'c.rpos'
-line 943:    );
+    );
-line 944:
-line 945:    $search_condition =
+    $search_condition =
-line 946:    $join_tbl = array();
+    $join_tbl = array();
-line 947:
-line 948:    if ($current_area == 'A' || $current_area == 'P') {
+    if ($current_area == 'A' || $current_area == 'P') {
-line 949:
 </pre>
-* New code to change to:
+* New code to change to (7 lines of code):
 <pre>
-line 940:        'c.rpos'
+        'c.rpos'
-line 941:    );
+    );
-line 942:
-line 943:    $search_condition = $join_tbl = array();
+    $search_condition = $join_tbl = array();
-line 944:
-line 945:    if ($current_area == 'A' || $current_area == 'P') {
+    if ($current_area == 'A' || $current_area == 'P') {
-line 946:
 </pre>
 The built-in patch/upgrade utility basically works in the same way.
 [[Category:X-Cart user manual]]
 [[Category:X-Cart user manual]]

@@ Line 12: / Line 12: @@
 * 7 - indicates the number of lines in the changed code (after patch application)
-Then follows the file code that includes lines marked with the "+" and "-" signs. Lines marked with "+" are the lines that you need to add in the file to be patched. Lines marked with "-" are the lines that you need to remove from the file to be patched.
+Then follows the file code that includes lines marked with the "+" and "-" signs.
 Under 'Index:' you will find the name of the file to be patched, for example:
@@ Line 98: / Line 100: @@
 Total lines: 7 and 7 in each hunk correspondingly.
 [[Category:X-Cart user manual]]
 [[Category:X-Cart user manual]]