Comment # 8
on bug 11247
from Jeff Morriss
(In reply to Christopher Maynard from comment #6)
> Thanks for submitting and committing! The patch almost certainly won't
> apply cleanly to the 1.12 branch, so I don't think it can be cherry picked.
> What's the best way to back-port to 1.12 in this case?
Oops, I had forgotten your suggestion to back-port.
Yep, didn't work via the web UI.
The steps I usually follow to do a manual back-port are:
git checkout -b bug11247
git review -X 8802
vi epan/addr_resolv.c and fix the conflicts
git commit -a
> I assume that since 1.10 has reached EOL[1] that it's not worth back-porting
> to that branch?
Agreed.
You are receiving this mail because:
- You are watching all bug changes.