On Sat, May 21, 2011 at 10:18 PM, Grant Diffey
<gdiffey@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@cetacea:~/repos/chirp.hg$ hg stat
nevyn@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@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@cetacea:~/repos/chirp.hg$ patch -p1 < ~/Downloads/quick_multibank.patch
patching file chirpui/editorset.py
patching file chirpui/membankedit.py
nevyn@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@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.