How to create a patch - Revision history

Mudrd8mz: Reverted edits by Mudrd8mz (talk) to last revision by Nadavkav

2021-08-09T13:11:29Z

Reverted edits by Mudrd8mz (talk) to last revision by Nadav Kavalerchik

← Older revision		Revision as of 13:11, 9 August 2021
Line 43:		Line 43:
	* [[How_to_apply_a_patch]]		* [[How_to_apply_a_patch]]
	* [[Patch]]		* [[Patch]]
	* [https://www.youtube.com/watch?v=05BXj_Jeuzo ~~tableing~~ a bug - Video tutorial by Tim Hunt]		* [https://www.youtube.com/watch?v=05BXj_Jeuzo Fixing a bug - Video tutorial by Tim Hunt]

Mudrd8mz: MDLSITE-6551

2021-08-09T13:06:07Z

MDLSITE-6551

← Older revision		Revision as of 13:06, 9 August 2021
Line 43:		Line 43:
	* [[How_to_apply_a_patch]]		* [[How_to_apply_a_patch]]
	* [[Patch]]		* [[Patch]]
	* [https://www.youtube.com/watch?v=05BXj_Jeuzo ~~Fixing~~ a bug - Video tutorial by Tim Hunt]		* [https://www.youtube.com/watch?v=05BXj_Jeuzo tableing a bug - Video tutorial by Tim Hunt]

Nadavkav: /* See Also */

2015-01-25T20:23:35Z

Jleyva: /* Creating a patch using Git */

2014-05-07T08:03:19Z

Creating a patch using Git

← Older revision		Revision as of 08:03, 7 May 2014
Line 21:		Line 21:
	==Creating a patch using Git==		==Creating a patch using Git==

	Creating a patch if you're using Git for version control is similar to CVS, and similarly you don't need an unchanged copy of moodle to diff against.		Creating a patch if you're using Git for version control is similar to CVS, and similarly you don't need an unchanged copy of moodle to diff against.

			There are several ways for creating a patch, the recommended one is using git format-patch (as mentioned in MDL-43119)

	The easiest way to create a patch for the last commit is		The easiest way to create a patch for the last commit is

Skodak: CVS is not used any more

2013-11-10T08:45:14Z

CVS is not used any more

← Older revision		Revision as of 08:45, 10 November 2013
Line 10:		Line 10:

	diff -Naur standard_moodle my_moodle > patch.txt		diff -Naur standard_moodle my_moodle > patch.txt

	~~==Creating a patch using CVS (command line)==~~

	~~It is easier if you are using CVS to manage your development, because you don't need to keep the copy of 'standard_moodle'. CVS takes care of that for you. In your workspace (sandbox) type:~~

	~~cvs diff -uN > patch.txt~~

	If you have unversioned files to include in your patch, you will notice that the above command simply adds the file's name to the top of your patch, prefixed with a question mark. This is because your new file is not tagged for adding to the repository. Just do

	~~cvs add newfile~~

	~~Then~~

	~~cvs diff -uNa > patch.txt~~

	~~This should add the correct code to the patch, so that someone applying the patch to their working copy will have a new file created at the right place (hopefully!).~~

	If your patch, for some reason, contains a lot of white space changes in many files, you might want to add -Bbw to the diff call. Make sure these changes are really not significant (like adding or removing a space at the end of a line - editors like Eclipse sometimes do this automatically). This can make a patch a lot smaller, and thus easier to review. The complete call would then be

	~~cvs diff -uNawbB > patch.txt~~

	~~==Creating a patch using Tortoise CVS==~~

	~~[http://www.tortoisecvs.org/ Tortoise CVS] is a Windows GUI front end for CVS. To create a patch, right-click on a folder in CVS, and choose '''CVS -> Make patch ...''' from the context menu.~~

	==Creating a patch using Eclipse==		==Creating a patch using Eclipse==

Deraadt: Removing Tim's cautious note. These look OK to me.

2012-03-20T05:29:12Z

Removing Tim's cautious note. These look OK to me.

← Older revision		Revision as of 05:29, 20 March 2012
Line 4:		Line 4:
	'''		'''
	One of the most critical aspects of patch usage is identifying for your audience the location for the patch file for application relative to the -p flag! When you create patches note your location and provide that when you share patches. '''		One of the most critical aspects of patch usage is identifying for your audience the location for the patch file for application relative to the -p flag! When you create patches note your location and provide that when you share patches. '''

	''Note, I have not been able to test most of these instructions. They are about right, but I am hoping that as people use them, they will fill in any gaps, correct any details, and so on.[[User:Tim Hunt\|Tim Hunt]] 08:40, 25 June 2007 (CDT)''

	==Creating a patch using diff==		==Creating a patch using diff==

Aborrow: /* See Also */

2011-08-01T12:57:14Z

Marxjohnson at 13:25, 22 June 2009

2009-06-22T13:25:40Z

← Older revision		Revision as of 13:25, 22 June 2009
Line 44:		Line 44:

	[http://winmerge.org/ WinMerge] is a nice windows GUI for comparing folders. In this sense it is like the original command-line 'diff' program. You need a copy of 'standard_moodle' and 'my_moodle'. Use '''File -> Open...''' to open the two versions for comparison. This will give you a nice view of what you have changed. Then do '''Tools -> Generate patch ...'''. In the dialogue box, make sure you select Style: Unified in the Format box.		[http://winmerge.org/ WinMerge] is a nice windows GUI for comparing folders. In this sense it is like the original command-line 'diff' program. You need a copy of 'standard_moodle' and 'my_moodle'. Use '''File -> Open...''' to open the two versions for comparison. This will give you a nice view of what you have changed. Then do '''Tools -> Generate patch ...'''. In the dialogue box, make sure you select Style: Unified in the Format box.

			==Creating a patch using Git==

			Creating a patch if you're using Git for version control is similar to CVS, and similarly you don't need an unchanged copy of moodle to diff against.
			The easiest way to create a patch for the last commit is

			git show > patch.txt

			or if you want to create a patch between 2 specific commits you can use git diff

			git diff ''commitid1'' ''commitid2'' > patch.txt

			There's also a tool, format-patch, for formatting a patch to send as an e-mail. You can create patches for the last ''n'' revisions like this:

			git format-patch -''n''

			which will create the patch in the current directory. The -o parameter allows you to specify a different output directory.

	==See Also==		==See Also==

Totaltec at 09:12, 3 December 2008

2008-12-03T09:12:48Z

← Older revision		Revision as of 09:12, 3 December 2008
Line 15:		Line 15:
	==Creating a patch using CVS (command line)==		==Creating a patch using CVS (command line)==

	It is easier if you are using CVS to manage your development, because you don't need to keep the copy of 'standard_moodle'. CVS takes care of that for you. In ~~you~~ workspace (sandbox) type:		It is easier if you are using CVS to manage your development, because you don't need to keep the copy of 'standard_moodle'. CVS takes care of that for you. In your workspace (sandbox) type:

	cvs diff -uN > patch.txt		cvs diff -uN > patch.txt

Net-buoy at 17:24, 10 October 2008

2008-10-10T17:24:43Z

← Older revision		Revision as of 17:24, 10 October 2008
Line 2:		Line 2:

	This page explains how you can make a patch file. Patch is a standard format, and there are many options for how to create one. Pick the one that is easiest for you.		This page explains how you can make a patch file. Patch is a standard format, and there are many options for how to create one. Pick the one that is easiest for you.
			'''
			One of the most critical aspects of patch usage is identifying for your audience the location for the patch file for application relative to the -p flag! When you create patches note your location and provide that when you share patches. '''

	''Note, I have not been able to test most of these instructions. They are about right, but I am hoping that as people use them, they will fill in any gaps, correct any details, and so on.[[User:Tim Hunt\|Tim Hunt]] 08:40, 25 June 2007 (CDT)''		''Note, I have not been able to test most of these instructions. They are about right, but I am hoping that as people use them, they will fill in any gaps, correct any details, and so on.[[User:Tim Hunt\|Tim Hunt]] 08:40, 25 June 2007 (CDT)''

← Older revision		Revision as of 20:23, 25 January 2015
Line 43:		Line 43:
	* [[How_to_apply_a_patch]]		* [[How_to_apply_a_patch]]
	* [[Patch]]		* [[Patch]]
			* [https://www.youtube.com/watch?v=05BXj_Jeuzo Fixing a bug - Video tutorial by Tim Hunt]

← Older revision		Revision as of 12:57, 1 August 2011
Line 63:		Line 63:

	==See Also==		==See Also==
			* [http://drupal.org/node/1054616 Detailed instructions for creating patches using Git]: [http://moodle.org/mod/forum/discuss.php?d=181953#p792050 shared by Frank Ralf]
	* [[How_to_apply_a_patch]]		* [[How_to_apply_a_patch]]
	* [[Patch]]		* [[Patch]]