[chirp_devel] Quick Multi-bank editor

[Grant Diffey]

ok worked it out  shouldn't apply vx-banks.diff

then everything's good.


On Sat, May 21, 2011 at 10:18 PM, Grant Diffey <gdiffey at gmail.com> wrote:

> ok so I've got 4 patches
> vx8-banks.diff, vx8.diff and the two from this thread quickmultibank and
> bankfixes.patch
>
> applying the first two to current hg jon's first patch applies fine. then
> the second patch fails on two hunks
>
> pulling from http://d-rats.com/hg/chirp.hg
> searching for changes
> no changes found
> nevyn at cetacea:~/repos/chirp.hg$ hg stat
> nevyn at cetacea:~/repos/chirp.hg$ patch -p1 < ~/Downloads/vx-banks.diff
> patching file chirp/vx3.py
> patching file chirp/vx6.py
> patching file chirp/vx8.py
> nevyn at cetacea:~/repos/chirp.hg$ patch -p1 < ~/Downloads/vx8.diff
> patching file chirp/vx8.py
> Hunk #1 FAILED at 19.
> Hunk #2 succeeded at 90 (offset 6 lines).
> Hunk #3 FAILED at 175.
> 2 out of 3 hunks FAILED -- saving rejects to file chirp/vx8.py.rej
> nevyn at cetacea:~/repos/chirp.hg$ patch -p1 <
> ~/Downloads/quick_multibank.patch
> patching file chirpui/editorset.py
> patching file chirpui/membankedit.py
> nevyn at cetacea:~/repos/chirp.hg$ patch -p1 < ~/Downloads/bankfixes.patch
> patching file chirp/vx8.py
> Reversed (or previously applied) patch detected!  Assume -R? [n] n
> Apply anyway? [n] n
> Skipping patch.
> 2 out of 2 hunks ignored -- saving rejects to file chirp/vx8.py.rej
> patching file chirpui/membankedit.py
>
>
> So what am I missing/doing wrong would it be possible for someone to create
> a consolidated patch against hg current and post it?
>
> Grant.
>
>
>
> On Sat, May 21, 2011 at 9:27 PM, Dan Smith <dsmith at danplanet.com> wrote:
>
>> > I can't even find the context bits of vx8.py referenced in the patch.
>>
>> Sorry, I should have said, both of those patches were supposed to be
>> applied on top of Jon's vx8diff patch from 17-May.
>>
>> --
>> Dan Smith
>> www.danplanet.com
>> KK7DS
>> _______________________________________________
>> chirp_devel mailing list
>> chirp_devel at intrepid.danplanet.com
>> http://intrepid.danplanet.com/mailman/listinfo/chirp_devel
>>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://intrepid.danplanet.com/pipermail/chirp_devel/attachments/20110521/737aa7d6/attachment-0001.html