Patching - Revision history

Admin: /* Directory patches */

2017-10-10T01:07:10Z

Directory patches

← Older revision		Revision as of 01:07, 10 October 2017
Line 228:		Line 228:
	</pre>		</pre>

	which will remove two levels, <code>/home/charles</~~path~~>, from the locations of files being patched.		which will remove two levels, <code>/home/charles</code>, from the locations of files being patched.

	Alternatively, if using the patch created with relative paths, no level of stripping is needed:		Alternatively, if using the patch created with relative paths, no level of stripping is needed:

Admin: /* Directory patches */

2017-10-10T01:06:41Z

Directory patches

← Older revision		Revision as of 01:06, 10 October 2017
Line 166:		Line 166:
	When a patch of an entire directory is applied, an additional argument must be fed to patch:		When a patch of an entire directory is applied, an additional argument must be fed to patch:

	<~~syntaxhighlight~~>		<pre>
	$ cd src/		$ cd src/
	$ patch -p0 < src.patch		$ patch -p0 < src.patch
	</~~syntaxhighlight~~>		</pre>

	The <code>-pN</code> flag indicates the level of stripping that will occur for the files being patched.		The <code>-pN</code> flag indicates the level of stripping that will occur for the files being patched.
Line 177:		Line 177:
	To illustrate, creating a patch using absolute paths:		To illustrate, creating a patch using absolute paths:

	<~~syntaxhighlight~~>		<pre>
	$ diff -urNP \		$ diff -urNP \
	/home/charles/path/to/hello_world_1.cc \		/home/charles/path/to/hello_world_1.cc \
	/home/charles/new/path/to/hello_world_1.cc \		/home/charles/new/path/to/hello_world_1.cc \
	> hello_world_using_absolute_paths.patch		> hello_world_using_absolute_paths.patch
	</~~syntaxhighlight~~>		</pre>

	which creates the patch file		which creates the patch file

	<~~syntaxhighlight lang="diff"~~>		<pre>
	--- /home/charles/path/to/hello_world_1.cc 2010-11-24 14:03:25.000000000 -0700		--- /home/charles/path/to/hello_world_1.cc 2010-11-24 14:03:25.000000000 -0700
	+++ /home/charles/new/path/to/hello_world_1.cc 2010-11-24 14:00:17.000000000 -0700		+++ /home/charles/new/path/to/hello_world_1.cc 2010-11-24 14:00:17.000000000 -0700
Line 198:		Line 198:
	+ cout << "Welcome to C++ programming." << endl;		+ cout << "Welcome to C++ programming." << endl;
	}		}
	</~~syntaxhighlight~~>		</pre>

	Alternatively, if relative paths are used,		Alternatively, if relative paths are used,

	<~~syntaxhighlight~~>		<pre>
	$ diff -urNP path/to/hello_world_1.cc newpath/to/hello_world_1.cc > hello_world_using_relative_paths.patch		$ diff -urNP path/to/hello_world_1.cc newpath/to/hello_world_1.cc > hello_world_using_relative_paths.patch
	</~~syntaxhighlight~~>		</pre>

	this creates the patch file		this creates the patch file

	<~~syntaxhighlight lang="diff"~~>		<pre>
	--- path/to/hello_world_1.cc 2010-11-24 14:03:25.000000000 -0700		--- path/to/hello_world_1.cc 2010-11-24 14:03:25.000000000 -0700
	+++ newpath/to/hello_world_1.cc 2010-11-24 14:00:17.000000000 -0700		+++ newpath/to/hello_world_1.cc 2010-11-24 14:00:17.000000000 -0700
Line 220:		Line 220:
	+ cout << "Welcome to C++ programming." << endl;		+ cout << "Welcome to C++ programming." << endl;
	}		}
	</~~syntaxhighlight~~>		</pre>



	When applying the patch, the first case (absolute paths) requires 2 levels of stripping:		When applying the patch, the first case (absolute paths) requires 2 levels of stripping:

	<~~syntaxhighlight~~>		<pre>
	$ patch -p2 < hello_world_absolute_paths.patch		$ patch -p2 < hello_world_absolute_paths.patch
	</~~syntaxhighlight~~>		</pre>

	which will remove two levels, <code>/home/charles</path>, from the locations of files being patched.		which will remove two levels, <code>/home/charles</path>, from the locations of files being patched.
Line 234:		Line 232:
	Alternatively, if using the patch created with relative paths, no level of stripping is needed:		Alternatively, if using the patch created with relative paths, no level of stripping is needed:

	<~~syntaxhighlight~~>		<pre>
	$ patch -p0 < hello_world_absolute_paths.patch		$ patch -p0 < hello_world_absolute_paths.patch
	</~~syntaxhighlight~~>		</pre>

	== More complex scenarios ==		== More complex scenarios ==

Admin: /* Single-file patches */

2017-10-10T01:02:40Z

Single-file patches

← Older revision		Revision as of 01:02, 10 October 2017
Line 156:		Line 156:
	Using the example above, I can share the patch for <code>hello_world_1.cc</code> by sharing <code>hello_world_1.patch</code> with someone else who has <code>hello_world_1.cc</code>. Someone else can apply this patch to their <code>hello_world_1.cc</code> by running		Using the example above, I can share the patch for <code>hello_world_1.cc</code> by sharing <code>hello_world_1.patch</code> with someone else who has <code>hello_world_1.cc</code>. Someone else can apply this patch to their <code>hello_world_1.cc</code> by running

	<~~syntaxhighlight lang="bash"~~>		<pre>
	$ patch hello_world_1.cc < hello_world_1.patch		$ patch hello_world_1.cc < hello_world_1.patch
	</~~syntaxhighlight~~>		</pre>

	which results in a <code>hello_world_1.cc</code> that is now identical to <code>hello_world_2.cc</code> above.		which results in a <code>hello_world_1.cc</code> that is now identical to <code>hello_world_2.cc</code> above.



	== Directory patches ==		== Directory patches ==

Admin: /* Creating patches with diff */

2017-10-10T01:02:18Z

Creating patches with diff

← Older revision		Revision as of 01:02, 10 October 2017
Line 18:		Line 18:
	\|'''hello_world_1.cc'''		\|'''hello_world_1.cc'''

	<~~syntaxhighlight lang="cpp"~~>		<pre>
	#include <iostream>		#include <iostream>

Line 27:		Line 27:
	cout << "Welcome to C++ Programming!" << endl;		cout << "Welcome to C++ Programming!" << endl;
	}		}
	</~~syntaxhighlight~~>		</pre>

	\|'''hello_world_2.cc'''		\|'''hello_world_2.cc'''

	<~~syntaxhighlight lang="cpp"~~>		<pre>
	#include <iostream>		#include <iostream>

Line 40:		Line 40:
	cout << "Welcome to C++ programming." << endl;		cout << "Welcome to C++ programming." << endl;
	}		}
	</~~syntaxhighlight~~>		</pre>
	\|}		\|}

	Then the output of the diff command will be:		Then the output of the diff command will be:

	<~~syntaxhighlight lang="bash"~~>		<pre>
	$ diff hello_world_1.cc hello_world_2.cc		$ diff hello_world_1.cc hello_world_2.cc

Line 55:		Line 55:
	> cout << "Welcome to C++ programming." << endl;		> cout << "Welcome to C++ programming." << endl;

	</~~syntaxhighlight~~>		</pre>

	which tells me that lines 6 and 7 of the original file were changed to lines 6 and 7 of the new file, with the old and new lines listed.		which tells me that lines 6 and 7 of the original file were changed to lines 6 and 7 of the new file, with the old and new lines listed.
Line 61:		Line 61:
	I can put this change into a patch file by running:		I can put this change into a patch file by running:

	<~~syntaxhighlight lang="bash"~~>		<pre>
	$ diff hello_world_1.cc hello_world_2.cc > hello_world_1.patch		$ diff hello_world_1.cc hello_world_2.cc > hello_world_1.patch
	</~~syntaxhighlight~~>		</pre>

	But if I share this patch with someone else, they need to know which file to apply the patch to. As the number of changes increases, and as I incorporate more changed files into my patches, I will need to include information about which files must be changed in the patch itself.		But if I share this patch with someone else, they need to know which file to apply the patch to. As the number of changes increases, and as I incorporate more changed files into my patches, I will need to include information about which files must be changed in the patch itself.
Line 69:		Line 69:
	Diff has a <code>-u</code> flag, which outputs the difference between the files in the "unified output format". This includes information about which file is being patched.		Diff has a <code>-u</code> flag, which outputs the difference between the files in the "unified output format". This includes information about which file is being patched.

	<~~syntaxhighlight lang="bash"~~>		<pre>
	$ diff -u hello_world_1.cc hello_world_2.cc		$ diff -u hello_world_1.cc hello_world_2.cc

Line 84:		Line 84:
	}		}

	</~~syntaxhighlight~~>		</pre>

	This can also be put into a patch file via:		This can also be put into a patch file via:

	<~~syntaxhighlight~~>		<pre>
	$ diff -u hello_world_1.cc hello_world_2.cc > hello_world_1.patch		$ diff -u hello_world_1.cc hello_world_2.cc > hello_world_1.patch
	</~~syntaxhighlight~~>		</pre>

	except now the person applying the patch does not need to know which files the patch must be applied to.		except now the person applying the patch does not need to know which files the patch must be applied to.
Line 98:		Line 98:
	Let's say you're dealing with a complex software project with a directory tree that looks something like this:		Let's say you're dealing with a complex software project with a directory tree that looks something like this:

	<~~syntaxhighlight lang="text"~~>		<pre>
	src/		src/
	models/		models/
	grid/		grid/
	turbulence/		turbulence/
	</~~syntaxhighlight~~>		</pre>

	If you want to make a patch file of the entire directory of <code>src/</code> using diff, and you have a copy of the original src/ directory, you can do this:		If you want to make a patch file of the entire directory of <code>src/</code> using diff, and you have a copy of the original src/ directory, you can do this:

	<~~syntaxhighlight~~>		<pre>
	$ ls		$ ls
	src/		src/
Line 113:		Line 113:

	$ diff -ruPN src/ original_src/ > src.patch		$ diff -ruPN src/ original_src/ > src.patch
	</~~syntaxhighlight~~>		</pre>

	* The <code>-r</code> flag runs diff recursively		* The <code>-r</code> flag runs diff recursively
Line 121:		Line 121:
	Another very useful flag is the <code>-x</code> (or <code>-X</code>) flag, which keeps any files matching a regular expression from being included in the patch. This would be useful if, say, each person working on the software project had to maintain his or her own Makefile, and you wanted to distribute a patch without messing up everyone else's Makefile. You could run:		Another very useful flag is the <code>-x</code> (or <code>-X</code>) flag, which keeps any files matching a regular expression from being included in the patch. This would be useful if, say, each person working on the software project had to maintain his or her own Makefile, and you wanted to distribute a patch without messing up everyone else's Makefile. You could run:

	<~~syntaxhighlight~~>		<pre>
	$ diff -ruPN -x "Makefile" src/ original_src/ > src.patch		$ diff -ruPN -x "Makefile" src/ original_src/ > src.patch
	</~~syntaxhighlight~~>		</pre>

	or, if you have a number of different files or patterns that you don't want to include in the patch:		or, if you have a number of different files or patterns that you don't want to include in the patch:

	<~~syntaxhighlight~~>		<pre>
	$ diff -ruPN -x "Makefile" -x "pattern2" -x "pattern3" src/ original_src/ > src.patch		$ diff -ruPN -x "Makefile" -x "pattern2" -x "pattern3" src/ original_src/ > src.patch
	</~~syntaxhighlight~~>		</pre>

	or alternatively, create a file with patterns and feed it to the <code>-X</code> flag.		or alternatively, create a file with patterns and feed it to the <code>-X</code> flag.

	<~~syntaxhighlight~~>		<pre>
	$ cat exclude_patterns		$ cat exclude_patterns
	pattern1*		pattern1*
Line 140:		Line 140:

	$ diff -ruPN -X exclude_patterns src/ original_src/ > src.patch		$ diff -ruPN -X exclude_patterns src/ original_src/ > src.patch
	</~~syntaxhighlight~~>		</pre>

	== Creating patches with SVN diff ==		== Creating patches with SVN diff ==

Admin at 16:32, 28 May 2011

2011-05-28T16:32:39Z

← Older revision		Revision as of 16:32, 28 May 2011
Line 257:		Line 257:


	~~[[Category:Computers]]~~		{{Programs}}
	~~[[Category:Programming]]~~		{{Unix Programs}}

Admin: /* Directory patches */

2011-05-28T16:31:55Z

Directory patches

← Older revision		Revision as of 16:31, 28 May 2011
Line 180:		Line 180:

	<syntaxhighlight>		<syntaxhighlight>
	$ diff -urNP /home/charles/path/to/hello_world_1.cc /home/charles/new/path/to/hello_world_1.cc > hello_world_using_absolute_paths.patch		$ diff -urNP \
			/home/charles/path/to/hello_world_1.cc \
			/home/charles/new/path/to/hello_world_1.cc \
			> hello_world_using_absolute_paths.patch
	</syntaxhighlight>		</syntaxhighlight>

Admin at 01:11, 25 November 2010

2010-11-25T01:11:11Z

← Older revision		Revision as of 01:11, 25 November 2010
Line 98:		Line 98:
	Let's say you're dealing with a complex software project with a directory tree that looks something like this:		Let's say you're dealing with a complex software project with a directory tree that looks something like this:

	<syntaxhighlight>		<syntaxhighlight lang="text">
	src/		src/
	models/		models/
Line 185:		Line 185:
	which creates the patch file		which creates the patch file

	<syntaxhighlight lang="~~text~~">		<syntaxhighlight lang="diff">
	--- /home/charles/path/to/hello_world_1.cc 2010-11-24 14:03:25.000000000 -0700		--- /home/charles/path/to/hello_world_1.cc 2010-11-24 14:03:25.000000000 -0700
	+++ /home/charles/new/path/to/hello_world_1.cc 2010-11-24 14:00:17.000000000 -0700		+++ /home/charles/new/path/to/hello_world_1.cc 2010-11-24 14:00:17.000000000 -0700
Line 207:		Line 207:
	this creates the patch file		this creates the patch file

	<syntaxhighlight lang="~~text~~">		<syntaxhighlight lang="diff">
	--- path/to/hello_world_1.cc 2010-11-24 14:03:25.000000000 -0700		--- path/to/hello_world_1.cc 2010-11-24 14:03:25.000000000 -0700
	+++ newpath/to/hello_world_1.cc 2010-11-24 14:00:17.000000000 -0700		+++ newpath/to/hello_world_1.cc 2010-11-24 14:00:17.000000000 -0700

Admin: /* Directory patches */

2010-11-25T01:09:14Z

Directory patches

← Older revision		Revision as of 01:09, 25 November 2010
Line 165:		Line 165:

	== Directory patches ==		== Directory patches ==

			When a patch of an entire directory is applied, an additional argument must be fed to patch:

			<syntaxhighlight>
			$ cd src/
			$ patch -p0 < src.patch
			</syntaxhighlight>

			The <code>-pN</code> flag indicates the level of stripping that will occur for the files being patched.



			To illustrate, creating a patch using absolute paths:

			<syntaxhighlight>
			$ diff -urNP /home/charles/path/to/hello_world_1.cc /home/charles/new/path/to/hello_world_1.cc > hello_world_using_absolute_paths.patch
			</syntaxhighlight>

			which creates the patch file

			<syntaxhighlight lang="text">
			--- /home/charles/path/to/hello_world_1.cc 2010-11-24 14:03:25.000000000 -0700
			+++ /home/charles/new/path/to/hello_world_1.cc 2010-11-24 14:00:17.000000000 -0700
			@@ -3,6 +3,6 @@
			using namespace std;
			void main()
			{
			- cout << "Hello World!" << endl;
			- cout << "Welcome to C++ Programming!" << endl;
			+ cout << "Hello world." << endl;
			+ cout << "Welcome to C++ programming." << endl;
			}
			</syntaxhighlight>

			Alternatively, if relative paths are used,

			<syntaxhighlight>
			$ diff -urNP path/to/hello_world_1.cc newpath/to/hello_world_1.cc > hello_world_using_relative_paths.patch
			</syntaxhighlight>

			this creates the patch file

			<syntaxhighlight lang="text">
			--- path/to/hello_world_1.cc 2010-11-24 14:03:25.000000000 -0700
			+++ newpath/to/hello_world_1.cc 2010-11-24 14:00:17.000000000 -0700
			@@ -3,6 +3,6 @@
			using namespace std;
			void main()
			{
			- cout << "Hello World!" << endl;
			- cout << "Welcome to C++ Programming!" << endl;
			+ cout << "Hello world." << endl;
			+ cout << "Welcome to C++ programming." << endl;
			}
			</syntaxhighlight>



			When applying the patch, the first case (absolute paths) requires 2 levels of stripping:

			<syntaxhighlight>
			$ patch -p2 < hello_world_absolute_paths.patch
			</syntaxhighlight>

			which will remove two levels, <code>/home/charles</path>, from the locations of files being patched.

			Alternatively, if using the patch created with relative paths, no level of stripping is needed:

			<syntaxhighlight>
			$ patch -p0 < hello_world_absolute_paths.patch
			</syntaxhighlight>

	== More complex scenarios ==		== More complex scenarios ==

Admin: /* Creating patches with SVN diff */

2010-11-24T23:17:40Z

Creating patches with SVN diff

← Older revision		Revision as of 23:17, 24 November 2010
Line 143:		Line 143:

	== Creating patches with SVN diff ==		== Creating patches with SVN diff ==

			Large software projects are often dealt with using [[Subversion]]. Patches can be easily made using subversion, since the <code>svn diff</code> command outputs in the same format as <code>diff -ruPN</code>. To make a patch from <code>svn</code>, simply redirect the output of <code>svn diff</code> to your patch file:

			<syntaxhighlight>
			$ svn diff src/ > src.patch
			</syntaxhighlight>

	= Applying patches =		= Applying patches =

Admin at 22:07, 24 November 2010

2010-11-24T22:07:21Z

← Older revision		Revision as of 22:07, 24 November 2010
Line 105:		Line 105:
	</syntaxhighlight>		</syntaxhighlight>

	If you want to make a patch file of the entire directory of <code>src/<code> using diff, and you have a copy of the original src/ directory, you can do this:		If you want to make a patch file of the entire directory of <code>src/</code> using diff, and you have a copy of the original src/ directory, you can do this:

	<syntaxhighlight>		<syntaxhighlight>