On Thu, Jun 18, 2009 at 9:53 PM, Tim A.<[email protected]> wrote: > No, no, I'm unfamiliar with the process. I'm sure you were perfectly clear. > Ok, but I'll have to clean up first. > A diff -rub in my current setup is messy. I guess I'm working a bit bass > ackwards here. > I copied the modified file from my production box (1.2.2) to my new 1.2.2 > dev VM and diffed it there, removing the additional (dev) entries by hand, > leaving only the pertinent. > > Anyway, I have a standard 1.2.2 vm installing and can do it there when its > done.
All you need to do is use the -rub option with diff the next time. When you try to apply your patch it will not work. For example: diff -rub filter.inc.new filter.inc.old (I may have the arguments reversed but it should be obvious). Thanks, Scott --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] Commercial support available - https://portal.pfsense.org
