Small patch to correct spelling of lemonade. Should ask Sean if he really wanted it to be lemonaid. If not, here''s the patch. On another note... This sample works! Kudos. It is odd that the textbox doesn''t scroll. I suppose I may patch that, too. Roy _______________________________________________ wxruby-users mailing list wxruby-users@rubyforge.org http://rubyforge.org/mailman/listinfo/wxruby-users
Spelling never was my strong suit, I thought I checked the spelling on everything. Oh well. :) Sean On 8/19/05, Roy Sutton <roys@mindspring.com> wrote:> Small patch to correct spelling of lemonade. Should ask Sean if he > really wanted it to be lemonaid. If not, here''s the patch. > > On another note... This sample works! Kudos. It is odd that the > textbox doesn''t scroll. I suppose I may patch that, too. > > Roy > > > --- listbook.old 2005-08-17 19:37:52.000000000 -0400 > +++ listbook.xrc 2005-08-19 19:30:47.871835200 -0400 > @@ -204,7 +204,7 @@ > <content> > <item>soda</item> > <item>tea</item> > - <item>lemonaid</item> > + <item>lemonade</item> > <item>coffee</item> > <item>water</item> > </content> > > > _______________________________________________ > wxruby-users mailing list > wxruby-users@rubyforge.org > http://rubyforge.org/mailman/listinfo/wxruby-users > > >
Roy Sutton wrote:> Small patch to correct spelling of lemonade. Should ask Sean if he > really wanted it to be lemonaid. If not, here''s the patch.Committed. If possible, I would prefer if you could generate your diffs from the directory above the wxruby root, so that I can apply them with patch -p1. Personally I think -p0 makes more sense, but for some reason -p1 is more standard, and I have already encountered one patching tool that only supports -p1. Thanks, Kevin
I wish I understood what you meant by this. :) Could you give me an example or point me to documentation on this? Kevin Smith wrote:> Roy Sutton wrote: > >> Small patch to correct spelling of lemonade. Should ask Sean if he >> really wanted it to be lemonaid. If not, here''s the patch. > > > Committed. > > If possible, I would prefer if you could generate your diffs from the > directory above the wxruby root, so that I can apply them with patch > -p1. Personally I think -p0 makes more sense, but for some reason -p1 > is more standard, and I have already encountered one patching tool > that only supports -p1. > > Thanks, > > Kevin > _______________________________________________ > wxruby-users mailing list > wxruby-users@rubyforge.org > http://rubyforge.org/mailman/listinfo/wxruby-users > > >
I *think* it just depends on what directory you are in when you run the diff command. If you''re in the directory with the files (e.g. samples/listbook) then it will just put filenames in the .patch file. But if you''re above wxruby2, and say something like: [blahblah]diff wxruby2/samples/listbook [blahblah] then it will embed that relative path into the .patch file. I have hardly created any diffs, so that''s about all I can say without doing some reading. Perhaps Sean can explain how he generates his patches. Kevin Roy Sutton wrote:> I wish I understood what you meant by this. :) Could you give me an > example or point me to documentation on this? > > Kevin Smith wrote: > >> Roy Sutton wrote: >> >>> Small patch to correct spelling of lemonade. Should ask Sean if he >>> really wanted it to be lemonaid. If not, here''s the patch. >> >> >> >> Committed. >> >> If possible, I would prefer if you could generate your diffs from the >> directory above the wxruby root, so that I can apply them with patch >> -p1. Personally I think -p0 makes more sense, but for some reason -p1 >> is more standard, and I have already encountered one patching tool >> that only supports -p1. >> >> Thanks, >> >> Kevin >> _______________________________________________ >> wxruby-users mailing list >> wxruby-users@rubyforge.org >> http://rubyforge.org/mailman/listinfo/wxruby-users >> >> >> > > _______________________________________________ > wxruby-users mailing list > wxruby-users@rubyforge.org > http://rubyforge.org/mailman/listinfo/wxruby-users
It is the current directory that determines if it is -p0 or -p1. Here are my notes I use when I generate patches: #first login to cvs server cvs -d :pserver:anonymous@rubyforge.org:/var/cvs/wxruby login #for convienence set your CVSROOT #Unix export CVSROOT=:pserver:anonymous@rubyforge.org:/var/cvs/wxruby #Windows set CVSROOT=:pserver:anonymous@rubyforge.org:/var/cvs/wxruby #to create a patch go into directory above the wxruby2 root directory and type cvs diff -r HEAD -b -u wxruby2/swig/common.i > diff.patch #send the patch the Kevin or another project maintainer # they will then go to directory above wxruby2/ and type: patch -p1 < diff.patch Sean On 8/19/05, Kevin Smith <wxruby@qualitycode.com> wrote:> I *think* it just depends on what directory you are in when you run the > diff command. If you''re in the directory with the files (e.g. > samples/listbook) then it will just put filenames in the .patch file. > But if you''re above wxruby2, and say something like: > [blahblah]diff wxruby2/samples/listbook [blahblah] > then it will embed that relative path into the .patch file. > > I have hardly created any diffs, so that''s about all I can say without > doing some reading. Perhaps Sean can explain how he generates his patches. > > Kevin > > > Roy Sutton wrote: > > I wish I understood what you meant by this. :) Could you give me an > > example or point me to documentation on this? > > > > Kevin Smith wrote: > > > >> Roy Sutton wrote: > >> > >>> Small patch to correct spelling of lemonade. Should ask Sean if he > >>> really wanted it to be lemonaid. If not, here''s the patch. > >> > >> > >> > >> Committed. > >> > >> If possible, I would prefer if you could generate your diffs from the > >> directory above the wxruby root, so that I can apply them with patch > >> -p1. Personally I think -p0 makes more sense, but for some reason -p1 > >> is more standard, and I have already encountered one patching tool > >> that only supports -p1. > >> > >> Thanks, > >> > >> Kevin > >> _______________________________________________ > >> wxruby-users mailing list > >> wxruby-users@rubyforge.org > >> http://rubyforge.org/mailman/listinfo/wxruby-users > >> > >> > >> > > > > _______________________________________________ > > wxruby-users mailing list > > wxruby-users@rubyforge.org > > http://rubyforge.org/mailman/listinfo/wxruby-users > > _______________________________________________ > wxruby-users mailing list > wxruby-users@rubyforge.org > http://rubyforge.org/mailman/listinfo/wxruby-users >
Sean Long wrote:> It is the current directory that determines if it is -p0 or -p1. > > Here are my notes I use when I generate patches:Thanks!> #first login to cvs server > cvs -d :pserver:anonymous@rubyforge.org:/var/cvs/wxruby login > > #for convienence set your CVSROOT > #Unix > export CVSROOT=:pserver:anonymous@rubyforge.org:/var/cvs/wxruby > > #Windows > set CVSROOT=:pserver:anonymous@rubyforge.org:/var/cvs/wxruby > > #to create a patch go into directory above the wxruby2 root directory and type > cvs diff -r HEAD -b -u wxruby2/swig/common.i > diff.patch > > #send the patch the Kevin or another project maintainer > # they will then go to directory above wxruby2/ and type: > patch -p1 < diff.patchActually, if I were in the directory above wxruby2, I would use -p0, indicating a zero delta between my current level and the level where the diff was performed. Typically I''m in the wxruby2 directory, using -p1. Kevin