Development:How to apply a patch - Revision history

TimHunt: /* Apply a Patch in Windows using gnuwin32 */

2010-06-23T13:02:59Z

Apply a Patch in Windows using gnuwin32

← Older revision		Revision as of 13:02, 23 June 2010
Line 19:		Line 19:
	c:\bin\patch.exe --dry-run -p1 < mynewpatch.diff		c:\bin\patch.exe --dry-run -p1 < mynewpatch.diff

	:The number after <tt>'-p'</tt> option can vary depending on the patch file, as it depends on the way the patch file was generated. Have a look at the [http://~~www~~.rt.~~com~~/man/patch~~.1.html~~ 'patch' utility manual page ] to see how the <tt>'-p'</tt> option works. You could also have a look at this [http://www.linuxtutorialblog.com/post/introduction-using-diff-and-patch-tutorial diff and patch tutorial].		:The number after <tt>'-p'</tt> option can vary depending on the patch file, as it depends on the way the patch file was generated. Have a look at the [http://linux.die.net/man/1/patch 'patch' utility manual page ] to see how the <tt>'-p'</tt> option works. You could also have a look at this [http://www.linuxtutorialblog.com/post/introduction-using-diff-and-patch-tutorial diff and patch tutorial].
	* You should get an output similar to this (the names and quantity of patched files vary from patch to patch):		* You should get an output similar to this (the names and quantity of patched files vary from patch to patch):

Nakohdo: /* Introduction */

2009-11-04T18:00:44Z

Introduction

← Older revision		Revision as of 18:00, 4 November 2009
Line 2:		Line 2:
	This page explains how you can apply a patch file. Patch is a standard format, and there are many options for how to apply one. Pick the one that is easiest for you.		This page explains how you can apply a patch file. Patch is a standard format, and there are many options for how to apply one. Pick the one that is easiest for you.

	Perhaps most critical is the usage of the -p flag, which tells patch about the relationship between the directory where the patch file is located and the files that will be patched. See the references below for details and DO NOT assume anything.		Perhaps most critical is the '''usage of the -p flag''', which tells patch about the relationship between the directory where the patch file is located and the files that will be patched. See the references below for details and DO NOT assume anything.

	==Apply a Patch in Windows using [http://gnuwin32.sourceforge.net/packages/patch.htm gnuwin32]==		==Apply a Patch in Windows using [http://gnuwin32.sourceforge.net/packages/patch.htm gnuwin32]==

Nakohdo: /* Apply a Patch in Windows using NetBeans */

2009-03-10T07:44:41Z

Apply a Patch in Windows using NetBeans

← Older revision		Revision as of 07:44, 10 March 2009
Line 62:		Line 62:
	== Apply a Patch in Windows using NetBeans ==		== Apply a Patch in Windows using NetBeans ==

	[http://www.netbeans.org/features/php/index.html NetBeans] comes with integrated tools for [http://www.netbeans.org/features/ide/collaboration.html version control and developer collaboration] which include powerful graphical Diff tools and easily applying (and creating) patches.		[http://www.netbeans.org/features/php/index.html NetBeans] comes with integrated tools for [http://www.netbeans.org/features/ide/collaboration.html version control and developer collaboration] which include powerful graphical Diff tools and easily applying (and creating) patches. You can apply any patch to file from the file's context menu.

	==Apply a Patch in Linux using "patch"==		==Apply a Patch in Linux using "patch"==

Nakohdo: /* Apply a Patch in Windows using NetBeans */

2009-03-10T07:42:03Z

Apply a Patch in Windows using NetBeans

← Older revision		Revision as of 07:42, 10 March 2009
Line 62:		Line 62:
	== Apply a Patch in Windows using NetBeans ==		== Apply a Patch in Windows using NetBeans ==

	[http://www.netbeans.org/features/php/index.html NetBeans] comes with integrated tools for [http://www.netbeans.org/features/ide/collaboration.html version control and developer collaboration] which ~~includes~~ powerful graphical Diff tools and easily applying (and creating) patches.		[http://www.netbeans.org/features/php/index.html NetBeans] comes with integrated tools for [http://www.netbeans.org/features/ide/collaboration.html version control and developer collaboration] which include powerful graphical Diff tools and easily applying (and creating) patches.

	==Apply a Patch in Linux using "patch"==		==Apply a Patch in Linux using "patch"==

Nakohdo: /* Apply a Patch in Windows using NetBeans */

2009-03-10T07:41:14Z

Apply a Patch in Windows using NetBeans

← Older revision		Revision as of 07:41, 10 March 2009
Line 61:		Line 61:

	== Apply a Patch in Windows using NetBeans ==		== Apply a Patch in Windows using NetBeans ==
	[~~TODO~~] ~~--[~~[~~User~~:~~Frank Ralf\|Frank Ralf]~~] ~~07:35, 10 March 2009~~ (~~UTC~~)
			[http://www.netbeans.org/features/php/index.html NetBeans] comes with integrated tools for [http://www.netbeans.org/features/ide/collaboration.html version control and developer collaboration] which includes powerful graphical Diff tools and easily applying (and creating) patches.

	==Apply a Patch in Linux using "patch"==		==Apply a Patch in Linux using "patch"==

Nakohdo: /* Apply a Patch in Windows using NetBeans */

2009-03-10T07:35:33Z

Apply a Patch in Windows using NetBeans

← Older revision		Revision as of 07:35, 10 March 2009
Line 59:		Line 59:
	cd \moodle		cd \moodle
	c:\bin\patch.exe -b -p1 < mynewpatch.diff		c:\bin\patch.exe -b -p1 < mynewpatch.diff

			== Apply a Patch in Windows using NetBeans ==
			[TODO] --[[User:Frank Ralf\|Frank Ralf]] 07:35, 10 March 2009 (UTC)

	==Apply a Patch in Linux using "patch"==		==Apply a Patch in Linux using "patch"==

Iarenaza: Add a note about not putting patch.exe in directories with white space in their path

2009-03-09T23:57:59Z

Add a note about not putting patch.exe in directories with white space in their path

← Older revision		Revision as of 23:57, 9 March 2009
Line 6:		Line 6:
	==Apply a Patch in Windows using [http://gnuwin32.sourceforge.net/packages/patch.htm gnuwin32]==		==Apply a Patch in Windows using [http://gnuwin32.sourceforge.net/packages/patch.htm gnuwin32]==

	* Download and extract patch for windows from [http://gnuwin32.sourceforge.net/packages/patch.htm sourceforge] I placed the patch.exe binary in C:\bin		* Download and extract patch for windows from [http://gnuwin32.sourceforge.net/packages/patch.htm sourceforge] I placed the patch.exe binary in C:\bin (NOTE: Things are a lot easier if you put it in a directory that doesn't have white spaces in it.)

	* Download and extract Moodle somewhere. eg: C:\moodle		* Download and extract Moodle somewhere. eg: C:\moodle

Nakohdo: /* See also */ added Category:Tutorial

2009-01-27T15:58:41Z

Iarenaza: Spanish translation

2008-12-30T22:12:25Z

Spanish translation

← Older revision		Revision as of 22:12, 30 December 2008
Line 74:		Line 74:

	[[Category:Developer]]		[[Category:Developer]]

			[[es:Como_aplicar_un_parche]]

Poltawski: /* Dealing with potential problems */

2008-12-11T13:48:58Z

Dealing with potential problems

← Older revision		Revision as of 13:48, 11 December 2008
Line 47:		Line 47:
	In the second case (failed hunks), unless you know how to fix the failed hunks by hand, you <b>should not apply</b> the patch, as that would corrupt your Moodle install. If you want to apply the patch and try to fix the failed hunks by hand, you should use the <tt>'-b'</tt> option. That option automatically makes a backup of every file the patch applies to, with the <tt>.orig</tt> extension. That would allow you go back to the original files state by simply overwritting the modified files with their <tt>.orig</tt> backups.		In the second case (failed hunks), unless you know how to fix the failed hunks by hand, you <b>should not apply</b> the patch, as that would corrupt your Moodle install. If you want to apply the patch and try to fix the failed hunks by hand, you should use the <tt>'-b'</tt> option. That option automatically makes a backup of every file the patch applies to, with the <tt>.orig</tt> extension. That would allow you go back to the original files state by simply overwritting the modified files with their <tt>.orig</tt> backups.

	Sometimes, there will be a large difference in line numbers since a patch was generated and the patch will not apply. You can tell patch allow larger differences in line numbers by using the fuzz option to increase the number of lines difference there can be. For example patch -F 100 would allow 100 lines difference.		Sometimes, there will be a large difference in line numbers since a patch was generated and the patch will not apply. You can tell patch allow larger differences in line numbers by using the fuzz option '-F' to increase the number of lines difference there can be. For example patch -F 100 would allow 100 lines difference.

	===Actually applying the patch===		===Actually applying the patch===

← Older revision		Revision as of 15:58, 27 January 2009
Line 74:		Line 74:

	[[Category:Developer]]		[[Category:Developer]]
			[[Category:Tutorial]]

	[[es:Como_aplicar_un_parche]]		[[es:Como_aplicar_un_parche]]