incubator-jspwiki-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Janne Jalkanen <Janne.Jalka...@ecyrd.com>
Subject Re: Patch procedures
Date Wed, 12 Dec 2007 06:15:06 GMT

Yes, "diff -Naur" is the equivalent command-lineish for Eclipse's  
Create Patch.  However, it's recommended that you make it from the  
top-level directory, so that the patch doesn't have strange paths like

+++myfile.java
----my_checkout_1234/src/com/ecyrd/jspwiki/myfile.java

As this tends to create a bit of confusion when patching.

It would be awesome if someone documented this somewhere on  
jspwiki.org - there's a ContributingChanges page which already  
contains some guidelines, but they could be cleared and clarified a bit.

http://www.jspwiki.org/wiki/ContributingChanges

/Janne

On 12 Dec 2007, at 06:06, Murray Altheim wrote:

> Dave Wolf wrote:
>> Hi Murray,
>> If you're using Eclipse and have JSPWiki project checked out from  
>> CVS you
>> can create a patch quite easily...
>> 1) Right-click on the project
>> 2) Select Team->Create Patch...
>> 3) Provide a name for the patch file.
>> 4) Select the files / lines to be included in the patch.
>> 5) Create the patch file and upload to the appropriate JIRA issue.
>> hope this helps,
>
> Hi Dave,
>
> But what about those of us not using Eclipse? will the
>
>    diff -Naur dir1 dir2
>
> I am currently using work okay?
>
> Thanks,
>
> Murray
>
> ...................................................................... 
> .....
> Murray Altheim <murray07 at altheim.com>                            
> ===  = =
> http://www.altheim.com/murray/                                      
> = =  ===
> SGML Grease Monkey, Banjo Player, Wantanabe Zen Monk                
> = =  = =
>
>       Boundless wind and moon - the eye within eyes,
>       Inexhaustible heaven and earth - the light beyond light,
>       The willow dark, the flower bright - ten thousand houses,
>       Knock at any door - there's one who will respond.
>                                       -- The Blue Cliff Record


Mime
View raw message