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

New issue 2437 by honghua....@gmail.com: "View Diff" cause "patch didn't apply cleanly" error when ReviewBoard is used with Git repository
http://code.google.com/p/reviewboard/issues/detail?id=2437

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

What version are you running?
ReviewBoard-1.6

What's the URL of the page containing the problem?
http://gerrit.am.freescale.net/r/49/diff/#index_header

What steps will reproduce the problem?
1. Send diff using rbtools

$post-review --guess-description --guess-summary
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 66648cc..6a98051 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -65,6 +65,7 @@
 #include <asm/kexec.h>
 #include <asm/mmu_context.h>
 #include <asm/code-patching.h>
+#include <asm/hugetlb.h>

 #include "setup.h"


2. Visit URL which generated review diff https://reviewboard.instance/r/49/diff/#index_header 3. when I click "View Diff" button on the review page, I get the following stack trace:

The patch to 'arch/powerpc/kernel/setup_64.c' didn't apply cleanly. The temporary files have been left in '/tmp/reviewboard.4NIpTN' for debugging purposes. `patch` returned: patching file /tmp/reviewboard.4NIpTN/tmpf8d2eE Hunk #1 FAILED at 65. 1 out of 1 hunk FAILED -- saving rejects to file /tmp/reviewboard.4NIpTN/tmpf8d2eE-new.rej

Traceback (most recent call last):
File "/usr/local/lib/python2.6/dist-packages/ReviewBoard-1.6-py2.6.egg/reviewboard/diffviewer/views.py", line 151, in view_diff
    interdiffset, highlighting, True)
File "/usr/local/lib/python2.6/dist-packages/ReviewBoard-1.6-py2.6.egg/reviewboard/diffviewer/diffutils.py", line 1071, in get_diff_files
    large_data=True)
File "/usr/local/lib/python2.6/dist-packages/Djblets-0.6.10-py2.6.egg/djblets/util/misc.py", line 155, in cache_memoize
    data = lookup_callable()
File "/usr/local/lib/python2.6/dist-packages/ReviewBoard-1.6-py2.6.egg/reviewboard/diffviewer/diffutils.py", line 1070, in <lambda>
    enable_syntax_highlighting)),
File "/usr/local/lib/python2.6/dist-packages/ReviewBoard-1.6-py2.6.egg/reviewboard/diffviewer/diffutils.py", line 552, in get_chunks
    new = get_patched_file(old, filediff)
File "/usr/local/lib/python2.6/dist-packages/ReviewBoard-1.6-py2.6.egg/reviewboard/diffviewer/diffutils.py", line 374, in get_patched_file
    return patch(filediff.diff, buffer, filediff.dest_file)
File "/usr/local/lib/python2.6/dist-packages/ReviewBoard-1.6-py2.6.egg/reviewboard/diffviewer/diffutils.py", line 242, in patch
    (filename, tempdir, patch_output))
Exception: The patch to 'arch/powerpc/kernel/setup_64.c' didn't apply cleanly. The temporary files have been left in '/tmp/reviewboard.4NIpTN' for debugging purposes.
`patch` returned: patching file /tmp/reviewboard.4NIpTN/tmpf8d2eE
Hunk #1 FAILED at 65.
1 out of 1 hunk FAILED -- saving rejects to file /tmp/reviewboard.4NIpTN/tmpf8d2eE-new.rej


What is the expected output? What do you see instead?


What operating system are you using? What browser?
ReviewBoard Server - Ubuntu 10.04.2 LTS
FireFox browser 3.6.24 - Windows




--
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