1801: The Reviewboard 1.0.9 chokes on a diff of a Visual Studio .vcproj project file

karen.ga********@gmai***** (Google Code) (Is this you? Claim this profile.)
Jan. 30, 2012 
Reviewboard fails parsing a diff of a .vcproj project file in my Visual Studio solution.

The patch file causing the problem is attached to the issue, and there is no problem with it.

But here is the error that I see when patch is uploaded to Reviewboard 1.0.9:

---------------------------------------------------------------------------

The patch to 'security-alert-service/security-alert-service.vcproj' didn't apply cleanly. The temporary files have been left in '/tmp/reviewboard.H89VPH' for debugging purposes. `patch` returned: patching file /tmp/reviewboard.H89VPH/tmp22U1xl patch: **** malformed patch at line 17: )\Settings.lib $(OutDir)\Subscriber.lib $(OutDir)\ScriptHandlerLib.lib ..\..\..\shared-libs\CrossPlatform\lib3rd\bin\win32\boost\v1.38\libboost_system-vc80-mt-sgd-1_38.lib $(OutDir)\SoftwareManagement.lib $(OutDir)\FulfillmentInService.lib ..\..\..\shared-libs\CrossPlatform\lib3rd\bin\win32\debug\curllib-vc80-mt-sgd-7_19_6.lib ..\..\..\shared-libs\CrossPlatform\lib3rd\bin\win32\debug\curlpp-vc80-mt-sgd-0_7_3.lib $(OutDir)\Migration.lib $(OutDir)\StorageManagement.lib ..\..\..\shared-libs\CrossPlatform\lib3rd\bin\win32\Debug_Unicode\json_spirit-vc80-mt-sgd-4_0_2.lib"

Traceback (most recent call last):
  File "/usr/lib/python2.6/site-packages/ReviewBoard-1.0.9-py2.6.egg/reviewboard/diffviewer/views.py", line 153, in view_diff
    interdiffset, highlighting, True)
  File "/usr/lib/python2.6/site-packages/ReviewBoard-1.0.9-py2.6.egg/reviewboard/diffviewer/diffutils.py", line 624, in get_diff_files
    large_data=True)
  File "/usr/lib/python2.6/site-packages/Djblets-0.6.3-py2.6.egg/djblets/util/misc.py", line 166, in cache_memoize
    data = lookup_callable()
  File "/usr/lib/python2.6/site-packages/ReviewBoard-1.0.9-py2.6.egg/reviewboard/diffviewer/diffutils.py", line 623, in <lambda>
    enable_syntax_highlighting),
  File "/usr/lib/python2.6/site-packages/ReviewBoard-1.0.9-py2.6.egg/reviewboard/diffviewer/diffutils.py", line 346, in get_chunks
    new = get_patched_file(old, filediff)
  File "/usr/lib/python2.6/site-packages/ReviewBoard-1.0.9-py2.6.egg/reviewboard/diffviewer/diffutils.py", line 261, in get_patched_file
    return patch(filediff.diff, buffer, filediff.dest_file)
  File "/usr/lib/python2.6/site-packages/ReviewBoard-1.0.9-py2.6.egg/reviewboard/diffviewer/diffutils.py", line 129, in patch
    (filename, tempdir, patch_output))
Exception: The patch to 'security-alert-service/security-alert-service.vcproj' didn't apply cleanly. The temporary files have been left in '/tmp/reviewboard.H89VPH' for debugging purposes.
`patch` returned: patching file /tmp/reviewboard.H89VPH/tmp22U1xl
patch: **** malformed patch at line 17: )\Settings.lib $(OutDir)\Subscriber.lib $(OutDir)\ScriptHandlerLib.lib ..\..\..\shared-libs\CrossPlatform\lib3rd\bin\win32\boost\v1.38\libboost_system-vc80-mt-sgd-1_38.lib $(OutDir)\SoftwareManagement.lib $(OutDir)\FulfillmentInService.lib ..\..\..\shared-libs\CrossPlatform\lib3rd\bin\win32\debug\curllib-vc80-mt-sgd-7_19_6.lib ..\..\..\shared-libs\CrossPlatform\lib3rd\bin\win32\debug\curlpp-vc80-mt-sgd-0_7_3.lib $(OutDir)\Migration.lib $(OutDir)\StorageManagement.lib ..\..\..\shared-libs\CrossPlatform\lib3rd\bin\win32\Debug_Unicode\json_spirit-vc80-mt-sgd-4_0_2.lib"
david
#1 david
  • +Component-DiffViewer
david
#2 david 
This is a very old bug. If it's still occurring, we need to know:
(a) what SCM is being used (including version and the OS of the server)
(b) what character set everything is using
(c) what line-endings you're seeing in the checked-in file, the diff file, and the version of the file it's trying to patch.
  • +SetupIssue