Wireshark-bugs: [Wireshark-bugs] [Bug 6416] Improved CIP and ENIP dissectors
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: bugzilla-daemon@xxxxxxxxxxxxx
Date: Tue, 25 Oct 2011 19:24:07 -0700 (PDT)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416

--- Comment #19 from Michael Mann <mmann78@xxxxxxxxxxxx> 2011-10-25 19:24:07 PDT ---
(In reply to comment #18)
> Are you generating the patch with a simple "svn diff"?  No options like "-x -w"
> which cause it to ignore whitespace changes?  Besides that my only
> thought/recommendation would be to try regenerating the patch.

I'd made the patch through TortoiseSVN -> Create patch...  That's worked for
all of the other patches I've submitted, but I never really had to deal with
resolving merge conflicts before submitting a patch.  Maybe too much brute
force on my part because I'm a newbie to the tools.

I'll submit the patch again when I address the other comments.

-- 
Configure bugmail: https://bugs.wireshark.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are watching all bug changes.