ok worked it out shouldn't apply vx-banks.diff<br><br>then everything's good.<br><br><br><div class="gmail_quote">On Sat, May 21, 2011 at 10:18 PM, Grant Diffey <span dir="ltr"><<a href="mailto:gdiffey@gmail.com">gdiffey@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">ok so I've got 4 patches<br>vx8-banks.diff, vx8.diff and the two from this thread quickmultibank and bankfixes.patch<br>
<br>applying the first two to current hg jon's first patch applies fine. then the second patch fails on two hunks<br>
<br>pulling from <a href="http://d-rats.com/hg/chirp.hg" target="_blank">http://d-rats.com/hg/chirp.hg</a><br>searching for changes<br>no changes found<br>nevyn@cetacea:~/repos/chirp.hg$ hg stat<br>nevyn@cetacea:~/repos/chirp.hg$ patch -p1 < ~/Downloads/vx-banks.diff <br>
patching file chirp/vx3.py<br>patching file chirp/vx6.py<br>patching file chirp/vx8.py<br>nevyn@cetacea:~/repos/chirp.hg$ patch -p1 < ~/Downloads/vx8.diff <br>patching file chirp/vx8.py<br>Hunk #1 FAILED at 19.<br>Hunk #2 succeeded at 90 (offset 6 lines).<br>
Hunk #3 FAILED at 175.<br>2 out of 3 hunks FAILED -- saving rejects to file chirp/vx8.py.rej<br>nevyn@cetacea:~/repos/chirp.hg$ patch -p1 < ~/Downloads/quick_multibank.patch <br>patching file chirpui/editorset.py<br>patching file chirpui/membankedit.py<br>
nevyn@cetacea:~/repos/chirp.hg$ patch -p1 < ~/Downloads/bankfixes.patch <br>patching file chirp/vx8.py<br>Reversed (or previously applied) patch detected! Assume -R? [n] n<br>Apply anyway? [n] n<br>Skipping patch.<br>
2 out of 2 hunks ignored -- saving rejects to file chirp/vx8.py.rej<br>patching file chirpui/membankedit.py<br><br><br>So what am I missing/doing wrong would it be possible for someone to create a consolidated patch against hg current and post it?<br>
<font color="#888888">
<br>Grant.</font><div><div></div><div class="h5"><br><br><br><div class="gmail_quote">On Sat, May 21, 2011 at 9:27 PM, Dan Smith <span dir="ltr"><<a href="mailto:dsmith@danplanet.com" target="_blank">dsmith@danplanet.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
<div>> I can't even find the context bits of vx8.py referenced in the patch.<br>
<br>
</div>Sorry, I should have said, both of those patches were supposed to be<br>
applied on top of Jon's vx8diff patch from 17-May.<br>
<div><div></div><div><br>
--<br>
Dan Smith<br>
<a href="http://www.danplanet.com" target="_blank">www.danplanet.com</a><br>
KK7DS<br>
_______________________________________________<br>
chirp_devel mailing list<br>
<a href="mailto:chirp_devel@intrepid.danplanet.com" target="_blank">chirp_devel@intrepid.danplanet.com</a><br>
<a href="http://intrepid.danplanet.com/mailman/listinfo/chirp_devel" target="_blank">http://intrepid.danplanet.com/mailman/listinfo/chirp_devel</a><br>
</div></div></blockquote></div><br>
</div></div></blockquote></div><br>