HowTo:Apply Patch - Revision history

Tbeholder at 13:20, 17 July 2013

2013-07-17T13:20:08Z

Tbeholder at 08:46, 17 July 2013

2013-07-17T08:46:36Z

Tbeholder at 08:43, 17 July 2013

2013-07-17T08:43:23Z

Tbeholder at 20:30, 16 July 2013

2013-07-16T20:30:43Z

Tbeholder: svn v.1.7 makes it easy

2013-07-16T19:55:11Z

svn v.1.7 makes it easy

Tbeholder at 15:46, 16 July 2013

2013-07-16T15:46:06Z

Tbeholder at 15:44, 16 July 2013

2013-07-16T15:44:58Z

Tbeholder at 15:44, 16 July 2013

2013-07-16T15:44:22Z

Tbeholder at 15:42, 16 July 2013

2013-07-16T15:42:23Z

Tbeholder at 15:30, 16 July 2013

2013-07-16T15:30:52Z

@@ Line 2: / Line 2: @@
 == Basics ==
-A '''patch file''' (or '''diff file''' - it's one and the same) contains instructions on modifying a set of existing text files from known originals. It's used in Sourceforge projects to publish the newest code changes that didn't yet make it into "official" SVN, so if you want to beta-test and review [https://sourceforge.net/p/vegastrike/patches/ the lattest proposal for VS code], you need to download and apply patches.
+A '''patch file''' (or '''[http://filext.com/file-extension/diff diff] file''') contains instructions on modifying a set of existing text files from known originals. It's used in Sourceforge projects to publish the newest code changes that didn't yet make it into "official" SVN, so if you want to beta-test and review [https://sourceforge.net/p/vegastrike/patches/ the lattest proposal for VS code], you need to download and apply patches.
 It's a very good idea to look into the patch file before applying it (they are plain text, after all). For one, it's a non-reviewed piece of code that will be executable, and you probably would like to make sure it's no more hacky than it's supposed to be. Even if you trust the source, at very least look whether it's really a patchfile and whether you're about to apply it in the same place where it expects the files to be.

@@ Line 24: / Line 24: @@
 note that pathes here are relative to trunk/vegastrike.
-If you use a Subversion front-end, it may be able to apply patch on its own, or at least open a command shell window where you want it, saving cd around (e.g. [http://pysvn.tigris.org/ PySVN Workbench]] starts it at the path selected on the left panel tree).
+If you use a Subversion front-end, it may be able to apply patch on its own, or at least open a terminal window where you want it, saving cd around manually (e.g. [http://pysvn.tigris.org/ PySVN Workbench] starts command shell at the path selected on the left panel tree).
 === Windows ===

@@ Line 24: / Line 24: @@
 note that pathes here are relative to trunk/vegastrike.
-If you use a Subversion front-end, it may be able to apply patch on its own, or at least open the command shell at the right place (e.g. in PySVN Workbench, right-click on the repository tree on the right panel).
+If you use a Subversion front-end, it may be able to apply patch on its own, or at least open a command shell window where you want it, saving cd around (e.g. [http://pysvn.tigris.org/ PySVN Workbench]] starts it at the path selected on the left panel tree).
 === Windows ===

@@ Line 27: / Line 27: @@
 === Windows ===
-There probably aren't any pre-installed utilities, but third-party ones are available (e.g. GnuWin32 [http://gnuwin32.sourceforge.net/packages/patch.htm includes it]). Also, in Windows you probably would use Subversion via front-end, and advanced ones (e.g. [http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-patch.html TortoiseSVN]) can create and apply patches all on their own.
+There probably aren't any pre-installed utilities, but third-party ones are available (e.g. GnuWin32 [http://gnuwin32.sourceforge.net/packages/patch.htm includes it]). Also, in Windows you probably would use Subversion via front-end / GUI client, and advanced ones (e.g. [http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-patch.html TortoiseSVN]) allow to apply patches on their own.
 == Create patch file ==
@@ Line 33: / Line 33: @@
 <code><br/>~/repositories/VegaStrike/trunk/vegastrike$ svn diff src/cmd/ai src/cmd/unit.cpp >~/tmp/MyLatestVSPatch.patch <br/>
 </code> - When SVN command is used without extra options like above, it compares the working copy with its backup base. Note that diff (standalone or SVN) will see path relatively to the place where it's running, so it's better to launch it from trunk/vegastrike too, but narrow the scope as needed via parameters - in the example src/cmd/unit.cpp and all files in src/cmd/* are checked for differences, but nothing else.
 == Revert patch ==
-It's easy to [http://svnbook.red-bean.com/en/1.7/svn.ref.svn.c.revert.html revert] a SVN working copy or its part to the original state, but it's also possible to ''un''-apply patches one by one - at least, if the patched files aren't changed after the patch in question was applied:
+It's easy to [http://svnbook.red-bean.com/en/1.7/svn.ref.svn.c.revert.html revert] a SVN working copy or its part to the original state as it was taken from the repository. But it's also possible to ''un''-apply patches one by one - at least, if the affected files weren't changed after the patch in question was applied (i.e. if more than one of them modified the same file, revert them from the last to the first):
 <code><br/> ~/repositories/VegaStrike/trunk/vegastrike$ patch -p0 -R -i ~/tmp/MyLatestVSPatch.patch <br/>
 </code> or

@@ Line 1: / Line 1: @@
 ----
-== Overview ==
+== Basics ==
 A '''patch file''' (or '''diff file''' - it's one and the same) contains instructions on modifying a set of existing text files from known originals. It's used in Sourceforge projects to publish the newest code changes that didn't yet make it into "official" SVN, so if you want to beta-test and review [https://sourceforge.net/p/vegastrike/patches/ the lattest proposal for VS code], you need to download and apply patches.
 It's a very good idea to look into the patch file before applying it (they are plain text, after all). For one, it's a non-reviewed piece of code that will be executable, and you probably would like to make sure it's no more hacky than it's supposed to be. Even if you trust the source, at very least look whether it's really a patchfile and whether you're about to apply it in the same place where it expects the files to be.
-== Linux ==
+== Apply patch file ==
-=== Apply patch file ===
+=== Linux ===
-In Linux, you probably already have (if you got Subversion package installed on Debian/*Ubuntu, it should be there too) <code>patch</code> utility, so all you need is to do at the proper base path (relatively to which path of each file is given, the same where diff was taken - usually '''[http://sourceforge.net/p/vegastrike/code/HEAD/tree/trunk/vegastrike/ trunk/vegastrike]''') and enter one command:
+In Linux, you probably already have (if you got Subversion package installed on Debian/*Ubuntu, it should be there too) <code>patch</code> utility, so all you need is to go at the proper base path (relatively to which path of each file is given, the same where diff was taken - usually '''[http://sourceforge.net/p/vegastrike/code/HEAD/tree/trunk/vegastrike/ trunk/vegastrike]''') - and type in command shell:
 <code><br/> /your/working/copy/directory.../trunk/vegastrike$ patch -p0 -i /wherever/you/saved/that/patch.../PatchFileName.patch <br/>
 </code> - e.g.
@@ Line 22: / Line 26: @@
 If you use a Subversion front-end, it may be able to apply patch on its own, or at least open the command shell at the right place (e.g. in PySVN Workbench, right-click on the repository tree on the right panel).
-=== Create patch file ===
+=== Windows ===
-To create patchfiles, you need something like
+There probably aren't any pre-installed utilities, but third-party ones are available (e.g. GnuWin32 [http://gnuwin32.sourceforge.net/packages/patch.htm includes it]). Also, in Windows you probably would use Subversion via front-end, and advanced ones (e.g. [http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-patch.html TortoiseSVN]) can create and apply patches all on their own.
 <code><br/>~/repositories/VegaStrike/trunk/vegastrike$ svn diff src/cmd/ai src/cmd/unit.cpp >~/tmp/MyLatestVSPatch.patch <br/>
-</code> - When SVN command is used with defaults like this, it compares the working copy with its backup base. Note that diff, whether standalone or SVN, will see path relatively to the place where it's running, so launch it from trunk/vegastrike too, but narrow its scope as needed with the parameters - in the example src/cmd/unit.cpp and all files in src/cmd/* are checked for differences, but nothing else.
+</code> - When SVN command is used without extra options like above, it compares the working copy with its backup base. Note that diff (standalone or SVN) will see path relatively to the place where it's running, so it's better to launch it from trunk/vegastrike too, but narrow the scope as needed via parameters - in the example src/cmd/unit.cpp and all files in src/cmd/* are checked for differences, but nothing else.
-== Windows ==
+== Revert patch ==
-There probably aren't any pre-installed utilities, but third-party ones are available (e.g. GnuWin32 [http://gnuwin32.sourceforge.net/packages/patch.htm includes it]). Also, in Windows you probably would use Subversion via front-end, and advanced ones (e.g. [http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-patch.html TortoiseSVN]) can create and apply patches all on their own.
+It's easy to [http://svnbook.red-bean.com/en/1.7/svn.ref.svn.c.revert.html revert] a SVN working copy or its part to the original state, but it's also possible to ''un''-apply patches one by one - at least, if the patched files aren't changed after the patch in question was applied:
 ----
 [[Category:HowTos|Apply Patch]]