151 ../baseline.txt. |
151 ../baseline.txt. |
152 Options: |
152 Options: |
153 -d, --diff-file FILE: The diffs will be written to FILE. |
153 -d, --diff-file FILE: The diffs will be written to FILE. |
154 Default ./patch-files/diff/patch-N.patch, where N is the baseline revision. |
154 Default ./patch-files/diff/patch-N.patch, where N is the baseline revision. |
155 -b, --baseline-dir DIR: The upstream baseline will be cloned into DIR if this |
155 -b, --baseline-dir DIR: The upstream baseline will be cloned into DIR if this |
156 does not seem to have been done already. Otherwise DIR/build will be udated to |
156 does not seem to have been done already. Otherwise DIR/build will be updated to |
157 the baseline revision before diffing. |
157 the baseline revision before diffing. |
158 It is assumed that the command 'diff' will invoke the diff tool. diff is not |
158 It is assumed that the command 'diff' will invoke the diff tool. diff is not |
159 standard equioment on Windows but a port is available: |
159 standard equioment on Windows but a port is available: |
160 http://gnuwin32.sourceforge.net/packages/diffutils.htm. |
160 http://gnuwin32.sourceforge.net/packages/diffutils.htm. |
161 |
161 |
162 * patch_upstream.pl |
162 * patch_upstream.pl |
163 ------------------- |
163 ------------------- |
164 Gets a copy of upstream package at the baseline revision in ../baseline.txt and |
164 Gets a copy of the upstream package at the baseline revision in ../baseline.txt |
165 applies a patch to it, by default making it the same as the revision of this |
165 and applies a patch to it, by default making it the same as the revision of this |
166 package that had that upstream baseline. |
166 package that had that upstream baseline. |
167 Options: |
167 Options: |
168 -p, --patch-file FILE: Apply the patch file FILE. |
168 -p, --patch-file FILE: Apply the patch file FILE. |
169 Default ./patch-files/diffs/patch-N.patch, where N is the baseline revision |
169 Default ./patch-files/diffs/patch-N.patch, where N is the baseline revision |
170 -b, --baseline-dir DIR: The upstream baseline will be cloned into DIR if this |
170 -b, --baseline-dir DIR: The upstream baseline will be cloned into DIR if this |
171 does not seem to have been done already. Otherwise DIR/build will be udated to |
171 does not seem to have been done already. Otherwise DIR/build will be updated to |
172 the baseline revision before patching. |
172 the baseline revision before patching. |
173 It is assumed that the command 'patch' will invoke the patch tool. patch is not |
173 It is assumed that the command 'patch' will invoke the patch tool. patch is not |
174 standard equioment on Windows but a port is available: |
174 standard equioment on Windows but a port is available: |
175 http://gnuwin32.sourceforge.net/packages/patch.htm |
175 http://gnuwin32.sourceforge.net/packages/patch.htm |
176 |
176 |