Documentation

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revision
Previous revision
patching [2010/10/17 18:45]
127.0.0.1 external edit
patching [2013/02/11 12:13]
Studio384 Small fix
Line 3: Line 3:
  
 **Note:** Patch files (''​.patch''​) are the same as diff files (''​.diff''​). The two names come from the programs used to create ([[http://​linux.die.net/​man/​1/​diff|diff]]) and apply ([[http://​linux.die.net/​man/​1/​patch|patch]]) them. **Note:** Patch files (''​.patch''​) are the same as diff files (''​.diff''​). The two names come from the programs used to create ([[http://​linux.die.net/​man/​1/​diff|diff]]) and apply ([[http://​linux.die.net/​man/​1/​patch|patch]]) them.
-==== Patching in Linux (and OS X) ====+===== Patching in Linux (and OS X) =====
 To apply the patch: To apply the patch:
   patch -p0 < fix.patch   patch -p0 < fix.patch
Line 10: Line 10:
 To reverse a patch, use the ''​-R''​ flag. To reverse a patch, use the ''​-R''​ flag.
   patch -p0 -R < fix.patch   patch -p0 -R < fix.patch
-==== Patching in Windows ====+===== Patching in Windows ​=====
  
 MSysGit includes patch.exe. To do patching, just open GIT Bash and use the Linux instruction above. MSysGit includes patch.exe. To do patching, just open GIT Bash and use the Linux instruction above.
  
-FIXME +Alternatively you can use [[http://​sourceforge.net/​projects/​tortoisesvn/​files/​Tools/​|TortoiseMerge]] ([[http://​tortoisesvn.net/​docs/​nightly/TortoiseMerge_en/help-onepage.html|instructions]]).
- +
-For more information see [[http://​tortoisesvn.net/​docs/​release/TortoiseSVN_en/tsvn-dug-patch.html|Creating and Applying Patches]].+