<html><body><div style="color:#000; background-color:#fff; font-family:lucida console, sans-serif;font-size:10pt"><div><span>suggest sublime or textmate</span></div><div><br></div> <div style="font-family: 'lucida console', sans-serif; font-size: 10pt;"> <div style="font-family: HelveticaNeue, 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif; font-size: 12pt;"> <div dir="ltr"> <hr size="1"> <font size="2" face="Arial"> <b><span style="font-weight:bold;">From:</span></b> Dave Nathanson <KG6ZJO@nathanson.org><br> <b><span style="font-weight: bold;">To:</span></b> chirp_devel@intrepid.danplanet.com <br> <b><span style="font-weight: bold;">Sent:</span></b> Friday, July 18, 2014 12:55 PM<br> <b><span style="font-weight: bold;">Subject:</span></b> Re: [chirp_devel] [PATCH] Allow specification of the hexdump address format<br> </font> </div> <div class="y_msg_container"><br>The free TextWrangler from BareBones is a great Macintosh Text
editor, and offers choices of line endings.<br clear="none"><a shape="rect" href="http://www.barebones.com/products/textwrangler/" target="_blank">http://www.barebones.com/products/textwrangler/</a><br clear="none"><br clear="none">Classic Mac: CR<br clear="none">Unix: LF<br clear="none">Windows CRLF<br clear="none"> As well as choice of encoding and a host of other great features. <br clear="none"><br clear="none">Best, <br clear="none"> Dave Nathanson<br clear="none"> KG6ZJO<br clear="none"><div class="qtdSeparateBR"><br><br></div><div class="yqt7549699136" id="yqtfd97177"><br clear="none">On Jul 18, 2014, at 10:32 AM, Dan Smith <<a shape="rect" ymailto="mailto:dsmith@danplanet.com" href="mailto:dsmith@danplanet.com">dsmith@danplanet.com</a>> wrote:<br clear="none">>> 1 out of 1 hunks FAILED -- saving rejects to file chirpui/mainapp.py.rej<br clear="none">>> abort: patch failed to apply<br clear="none">>>
================<br clear="none">> <br clear="none">> This is saying nothing applied, which generally means that line endings<br clear="none">> aren't right. I think you're using a mac, which uses \r line endings<br clear="none">> (sometimes, not always, and I can never remember when/why). My guess<br clear="none">> would be that you copy-and-paste'd the patch out to a file? In that<br clear="none">> case, you've got \r endings and the code has \n. Thus, patch (or hg<br clear="none">> import in this case) can't find any lines that match.<br clear="none"><br clear="none">_______________________________________________<br clear="none">chirp_devel mailing list<br clear="none"><a shape="rect" ymailto="mailto:chirp_devel@intrepid.danplanet.com" href="mailto:chirp_devel@intrepid.danplanet.com">chirp_devel@intrepid.danplanet.com</a><br clear="none"><a shape="rect" href="http://intrepid.danplanet.com/mailman/listinfo/chirp_devel"
target="_blank">http://intrepid.danplanet.com/mailman/listinfo/chirp_devel</a><br clear="none">Developer docs: <a shape="rect" href="http://chirp.danplanet.com/projects/chirp/wiki/Developers" target="_blank">http://chirp.danplanet.com/projects/chirp/wiki/Developers</a><br clear="none"></div><br><br></div> </div> </div> </div></body></html>