On Wednesday, November 13, 2013 9:16:34 PM UTC-6, Ben Fritz wrote: > On Wednesday, November 13, 2013 9:06:46 PM UTC-6, Ben Fritz wrote: > > On Wednesday, November 13, 2013 8:45:43 PM UTC-6, Daniel "paradigm" Thau > > wrote: > > > On Wednesday, November 13, 2013 9:06:25 PM UTC-5, Ben Fritz wrote: > > > Some googling around makes it seem as though Solaris's /usr/bin/patch may > > > not > > > know unified diff format. See if you have a /usr/bin/qpatch on your > > > system > > > and try with that. > > > > Ugh, good to know. I'll look for that utility at work tomorrow, or failing > > everything else just apply the patch by hand. It's pretty small. > > > > > I'll try and make a context format with diff -c later for you in the next > > > few > > > days if need be. > > > > No need, I'll generate it myself if I must. Sorry for the trouble. > > Actually I just made it now. Attached for anybody else who needs it. > > Here's how, from my home computer which DOES have Vim as an Hg repository: > > patch -p1 < autotextobject.diff > hg extdiff -o -Nprc > autotextobject_context.patch
WOW this is frustrating. Even my context diff did not apply on Solaris because of the prompt for a file to patch. I finally found /usr/bin/gpatch on the Solaris system, thanks to http://stackoverflow.com/questions/3477580/cant-apply-unified-diff-patch-on-solaris. This can apply either the context diff or the original unified diff. I think maybe that's what you meant instead of "qpatch" above. Windows GNU patch may have worked after I tweaked it for line endings, I thought it failed due to a failed hunk and aborted it. We both included some help tags stuff that had nothing to do with your change. -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
