What's the URL of the page containing the problem?
http://reviewboard.eng.vmware.com/r/7391/diff/6-7/#index_header
What steps will reproduce the problem?
1. view 6-7 interdiff on r/7391
2.
3.
What is the expected output? What do you see instead?
The interdiff is expected.
Actual:
The patch to 'bora/sysimage/apps/client/logic/UiController.h' didn't apply
cleanly. The temporary files have been left in '/tmp/reviewboard.UaB4oC'
for debugging purposes. `patch` returned: patching file
/tmp/reviewboard.UaB4oC/tmp0fDx-3 Hunk #1 FAILED at 3. 1 out of 1 hunk
FAILED -- saving rejects to file /tmp/reviewboard.UaB4oC/tmp0fDx-3-new.rej
Traceback (most recent call last):
File "/root/reviewboard/diffviewer/views.py", line 78, in view_diff
files = get_diff_files(diffset, None, interdiffset, highlighting)
File "/root/reviewboard/diffviewer/diffutils.py", line 534, in get_diff_files
enable_syntax_highlighting)
File "/root/reviewboard/diffviewer/diffutils.py", line 474, in generate_files
lambda: get_chunks(filediff.diffset,
File "/root/reviewboard/djblets/util/misc.py", line 44, in cache_memoize
data = lookup_callable()
File "/root/reviewboard/diffviewer/diffutils.py", line 477, in <lambda>
enable_syntax_highlighting))
File "/root/reviewboard/diffviewer/diffutils.py", line 276, in get_chunks
new = get_patched_file(old, filediff)
File "/root/reviewboard/diffviewer/diffutils.py", line 189, in
get_patched_file
return patch(filediff.diff, buffer, filediff.dest_file)
File "/root/reviewboard/diffviewer/diffutils.py", line 91, in patch
(filename, tempfile.tempdir, p.stdout.read()))
Exception: The patch to 'bora/sysimage/apps/client/logic/UiController.h'
didn't apply cleanly. The temporary files have been left in
'/tmp/reviewboard.UaB4oC' for debugging purposes.
`patch` returned: patching file /tmp/reviewboard.UaB4oC/tmp0fDx-3
Hunk #1 FAILED at 3.
1 out of 1 hunk FAILED -- saving rejects to file
/tmp/reviewboard.UaB4oC/tmp0fDx-3-new.rej
What operating system are you using? What browser?
WinXPsp2 Firefox2
Please provide any additional information below.
This appears to just be a malformed diff that's been uploaded. Not sure if
there is a reviewboard bug here or not, although I thought it wouldn't
accept malformed diffs.
