Status: New
Owner: ----
Labels: Type-Defect Priority-Medium

New issue 2851 by gjun...@gmail.com: Error: The patch to 'ProcessCVSFiles.java' didn't apply cleanly
http://code.google.com/p/reviewboard/issues/detail?id=2851

* NOTE: For customer support, please post to                     *
*       reviewbo...@googlegroups.com                             *
*                                                                *
*       Do not post confidential information in this bug report. *
*       If you need immediate support, please contact            *
*       reviewbo...@googlegroups.com                             *

What version are you running?
1.6.14

What's the URL of the page containing the problem?
http://reviewboard.alcatel-lucent.com/r/18659/diff/#index_header

What steps will reproduce the problem?
1. create a new review request
2. upload diff
3. click "diff"

What is the expected output? What do you see instead?
The expected output would be a normal diff rendering page

See error as below instead:
Diff currently unavailable.
Error: The patch to 'ProcessCVSFiles.java' didn't apply cleanly. The temporary files have been left in '/tmp/reviewboard.Hgacoh' for debugging purposes. `patch` returned: patching file /tmp/reviewboard.Hgacoh/tmpkYAmzh Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file /tmp/reviewboard.Hgacoh/tmpkYAmzh-new.rej
Details

Traceback (most recent call last):
File "/usr/local/lib/python2.7/dist-packages/ReviewBoard-1.6.14-py2.7.egg/reviewboard/diffviewer/views.py", line 384, in view_diff_fragment
    file = get_requested_diff_file()
File "/usr/local/lib/python2.7/dist-packages/ReviewBoard-1.6.14-py2.7.egg/reviewboard/diffviewer/views.py", line 310, in get_requested_diff_file
    populate_diff_chunks(files, highlighting)
File "/usr/local/lib/python2.7/dist-packages/ReviewBoard-1.6.14-py2.7.egg/reviewboard/diffviewer/diffutils.py", line 1188, in populate_diff_chunks
    large_data=True)
File "/usr/local/lib/python2.7/dist-packages/Djblets-0.6.27-py2.7.egg/djblets/util/misc.py", line 156, in cache_memoize
    data = lookup_callable()
File "/usr/local/lib/python2.7/dist-packages/ReviewBoard-1.6.14-py2.7.egg/reviewboard/diffviewer/diffutils.py", line 1187, in <lambda>
    enable_syntax_highlighting)),
File "/usr/local/lib/python2.7/dist-packages/ReviewBoard-1.6.14-py2.7.egg/reviewboard/diffviewer/diffutils.py", line 595, in get_chunks
    new = get_patched_file(old, filediff)
File "/usr/local/lib/python2.7/dist-packages/ReviewBoard-1.6.14-py2.7.egg/reviewboard/diffviewer/diffutils.py", line 388, in get_patched_file
    return patch(diff, buffer, filediff.dest_file)
File "/usr/local/lib/python2.7/dist-packages/ReviewBoard-1.6.14-py2.7.egg/reviewboard/diffviewer/diffutils.py", line 247, in patch
    (filename, tempdir, patch_output))
Exception: The patch to 'ProcessCVSFiles.java' didn't apply cleanly. The temporary files have been left in '/tmp/reviewboard.Hgacoh' for debugging purposes.
`patch` returned: patching file /tmp/reviewboard.Hgacoh/tmpkYAmzh
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file /tmp/reviewboard.Hgacoh/tmpkYAmzh-new.rej

What operating system are you using? What browser?
Ubuntu 12.04
Firefox (and Google Chrome)
SCM is cvs

Please provide any additional information below.

Diff currently unavailable. Error: The patch to 'project_sam.xml' didn't apply cleanly. The temporary files have been left in '/tmp/reviewboard.CRgaUy' for debugging purposes. `patch` returned: patching file /tmp/reviewboard.CRgaUy/tmpGdkjyO Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file /tmp/reviewboard.CRgaUy/tmpGdkjyO-new.rej Details
Traceback (most recent call last):
File "/usr/local/lib/python2.7/dist-packages/ReviewBoard-1.6.14-py2.7.egg/reviewboard/diffviewer/views.py", line 384, in view_diff_fragment
    file = get_requested_diff_file()
File "/usr/local/lib/python2.7/dist-packages/ReviewBoard-1.6.14-py2.7.egg/reviewboard/diffviewer/views.py", line 310, in get_requested_diff_file
    populate_diff_chunks(files, highlighting)
File "/usr/local/lib/python2.7/dist-packages/ReviewBoard-1.6.14-py2.7.egg/reviewboard/diffviewer/diffutils.py", line 1188, in populate_diff_chunks
    large_data=True)
File "/usr/local/lib/python2.7/dist-packages/Djblets-0.6.27-py2.7.egg/djblets/util/misc.py", line 156, in cache_memoize
    data = lookup_callable()
File "/usr/local/lib/python2.7/dist-packages/ReviewBoard-1.6.14-py2.7.egg/reviewboard/diffviewer/diffutils.py", line 1187, in <lambda>
    enable_syntax_highlighting)),
File "/usr/local/lib/python2.7/dist-packages/ReviewBoard-1.6.14-py2.7.egg/reviewboard/diffviewer/diffutils.py", line 595, in get_chunks
    new = get_patched_file(old, filediff)
File "/usr/local/lib/python2.7/dist-packages/ReviewBoard-1.6.14-py2.7.egg/reviewboard/diffviewer/diffutils.py", line 388, in get_patched_file
    return patch(diff, buffer, filediff.dest_file)
File "/usr/local/lib/python2.7/dist-packages/ReviewBoard-1.6.14-py2.7.egg/reviewboard/diffviewer/diffutils.py", line 247, in patch
    (filename, tempdir, patch_output))
Exception: The patch to 'project_sam.xml' didn't apply cleanly. The temporary files have been left in '/tmp/reviewboard.CRgaUy' for debugging purposes.
`patch` returned: patching file /tmp/reviewboard.CRgaUy/tmpGdkjyO
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file /tmp/reviewboard.CRgaUy/tmpGdkjyO-new.rej

--
You received this message because you are subscribed to the Google Groups 
"reviewboard-issues" group.
To post to this group, send email to reviewboard-issues@googlegroups.com.
To unsubscribe from this group, send email to 
reviewboard-issues+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/reviewboard-issues?hl=en.

Reply via email to