https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416
--- Comment #18 from Jeff Morriss <jeff.morriss.ws@xxxxxxxxx> 2011-10-25 19:19:47 PDT ---
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.
The packet-enip failure is simple: it's close to the SVN Id (which SVN reverts
to "$Id$" which non-SVN 'patch' then thinks is a conflict with what's actually
there). That can be applied manually.
--
Configure bugmail: https://bugs.wireshark.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are watching all bug changes.
