Re: How to apply a patch?
Glen Mazza wrote: I've submitted them frequently, but, given a patch, how does one apply it to a file in a working directory? CVS has the "diff" command to create the patch, but I don't know what its opposite command is, to merge the patch into a file. The command is 'patch', originally written by Larry Wall, of Perl fame. The basic command is patch < patchfile.diff provided you are in the proper CWD and the patch was generated properly. Otherwise you need the -p, and perhaps the -N or -R options. Alternatives: - Use Emacs (merge or diff-mode). - Apply the diff from within Eclipse. (BTW, using Windows 2000.) Get cygwin (http://www.cygwin.com). Download setup.exe, run it and follow the instructions. You'll have to select "developer" or some similar non-default package to get the patch utility. J.Pietschmann - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: How to apply a patch?
(resend) Glen Mazza wrote: > I've submitted them frequently, but, given a patch, > how does one apply it to a file in a working > directory? CVS has the "diff" command to create the > patch, but I don't know what its opposite command is, > to merge the patch into a file. The command is 'patch', originally written by Larry Wall, of Perl fame. The basic command is patch < patchfile.diff provided you are in the proper CWD and the patch was generated properly. Otherwise you need the -p, and perhaps the -N or -R options. Alternatives: - Use Emacs (merge or diff-mode). - Apply the diff from within Eclipse. > (BTW, using Windows 2000.) Get cygwin (http://www.cygwin.com). Download setup.exe, run it and follow the instructions. You'll have to select "developer" or some similar non-default package to get the patch utility. J.Pietschmann - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: How to apply a patch?
Thanks--I couldn't find the patch.exe in WinCVS (using 1.3 beta, and not their 1.2 version.) I downloaded a GPL port to Windows from here: http://www.circlemud.org/maillist/1998-01/0083.html. The version I downloaded works, only issue is that I need to save the file-to-be-revised into Unix format first (/r/n->/n) before applying the patch. Thanks, Glen --- Jeremias Maerki <[EMAIL PROTECTED]> wrote: > If you install WinCVS you get a patch.exe you can > use. Often you have to > tweak the command line parameters a bit (especially > -p) and sometimes > you have to edit the patch file itself. It's best if > you put the > directory with patch.exe in your PATH so you can > easily call it from the > right directory (relative paths and all). > > With WinCVS's patch.exe (normally): > > patch -p 0 < filename.dif > > Note before applying the patch file check how it > references the files as > you need to be in the correct directory to apply the > patch file. > > If you're using Eclipse as IDE you can use the > patcher from there. It's > pretty easy there. > > Good luck! > > On 20.07.2003 17:34:32 Glen Mazza wrote: > > I've submitted them frequently, but, given a > patch, > > how does one apply it to a file in a working > > directory? CVS has the "diff" command to create > the > > patch, but I don't know what its opposite command > is, > > to merge the patch into a file. > > > > (BTW, using Windows 2000.) > > > Jeremias Maerki > > > - > To unsubscribe, e-mail: > [EMAIL PROTECTED] > For additional commands, email: > [EMAIL PROTECTED] > __ Do you Yahoo!? SBC Yahoo! DSL - Now only $29.95 per month! http://sbc.yahoo.com - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: How to apply a patch?
If you install WinCVS you get a patch.exe you can use. Often you have to tweak the command line parameters a bit (especially -p) and sometimes you have to edit the patch file itself. It's best if you put the directory with patch.exe in your PATH so you can easily call it from the right directory (relative paths and all). With WinCVS's patch.exe (normally): patch -p 0 < filename.dif Note before applying the patch file check how it references the files as you need to be in the correct directory to apply the patch file. If you're using Eclipse as IDE you can use the patcher from there. It's pretty easy there. Good luck! On 20.07.2003 17:34:32 Glen Mazza wrote: > I've submitted them frequently, but, given a patch, > how does one apply it to a file in a working > directory? CVS has the "diff" command to create the > patch, but I don't know what its opposite command is, > to merge the patch into a file. > > (BTW, using Windows 2000.) Jeremias Maerki - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
