On 22 November 2012 14:03, Gary Gregory garydgreg...@gmail.com wrote:
Or .diff works well too. That is picked up by tools like tortoise*
It needs to be unified diff; some other diff formats don't work well.
But that is a separate issue from this patch which was about patch file names.
Gary
On Nov 22, 2012, at 6:00, s...@apache.org s...@apache.org wrote:
Author: sebb
Date: Thu Nov 22 10:59:47 2012
New Revision: 1412496
URL: http://svn.apache.org/viewvc?rev=1412496view=rev
Log:
Clarify that patch file names should have extensions
Modified:
commons/proper/commons-site/trunk/src/site/xdoc/patches.xml
Modified: commons/proper/commons-site/trunk/src/site/xdoc/patches.xml
URL:
http://svn.apache.org/viewvc/commons/proper/commons-site/trunk/src/site/xdoc/patches.xml?rev=1412496r1=1412495r2=1412496view=diff
==
--- commons/proper/commons-site/trunk/src/site/xdoc/patches.xml (original)
+++ commons/proper/commons-site/trunk/src/site/xdoc/patches.xml Thu Nov 22
10:59:47 2012
@@ -104,7 +104,7 @@
/p
p
The patch should be in unified format. You can create a patch in this
format (from Subversion) by using:
- sourcesvn diff emFile/em empatchfile/em/sourcebr/
+ sourcesvn diff emFile/em empatchfile/em/source
/p
p
The patch should be created from the project root, i.e. the directory
which contains the src/ folder
@@ -116,6 +116,12 @@
p
Try to give your patch files meaningful names. This makes it easier for
developers who need to
apply a number of different patches.
+ Also the file should have an extension of .patch or .txt; files without
extensions tend to be flagged
+ as binary by JIRA, which makes them awkward to use.
+ /p
+ p
+ For example:
+ sourcesvn diff emsrc/site/xdoc/patches.xml/em
emCOMMONSSITE-123.patch/em/sourcebr/
/p
/section
section name=Submitting A Patch
-
To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org
For additional commands, e-mail: dev-h...@commons.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org
For additional commands, e-mail: dev-h...@commons.apache.org
