Status: New
Owner: ----
Labels: Type-Defect Priority-Medium
New issue 2749 by bwmayn...@gmail.com: How do I fix a invalid diff patch
upload?????
http://code.google.com/p/reviewboard/issues/detail?id=2749
Please provide any additional information below.
The patch
to 'trunk/CommonAPI/CommonC/Include/C:/WORK/NEW_ARCH/eng-mfg-apps-repos/CommonAPI/CommonC/Include/controller.h'
didn't apply cleanly. The temporary files have been left
in '/tmp/reviewboard.2w3jya' for debugging purposes. `patch` returned:
patching file /tmp/reviewboard.2w3jya/tmppG_cQF Hunk #1 FAILED at 30. Hunk
#2 FAILED at 53. Hunk #3 FAILED at 67. Hunk #4 FAILED at 165. 4 out of 4
hunks FAILED -- saving rejects to file
/tmp/reviewboard.2w3jya/tmppG_cQF-new.rej
Traceback (most recent call last):
File "/usr/lib/python2.4/site-packages/ReviewBoard-1.6.3-py2.4.egg/reviewboard/diffviewer/views.py",
line 151, in view_diff
interdiffset, highlighting, True)
File "/usr/lib/python2.4/site-packages/ReviewBoard-1.6.3-py2.4.egg/reviewboard/diffviewer/diffutils.py",
line 1071, in get_diff_files
large_data=True)
File "/usr/lib/python2.4/site-packages/Djblets-0.6.14-py2.4.egg/djblets/util/misc.py",
line 156, in cache_memoize
data = lookup_callable()
File "/usr/lib/python2.4/site-packages/ReviewBoard-1.6.3-py2.4.egg/reviewboard/diffviewer/diffutils.py",
line 1070, in <lambda>
enable_syntax_highlighting)),
File "/usr/lib/python2.4/site-packages/ReviewBoard-1.6.3-py2.4.egg/reviewboard/diffviewer/diffutils.py",
line 552, in get_chunks
new = get_patched_file(old, filediff)
File "/usr/lib/python2.4/site-packages/ReviewBoard-1.6.3-py2.4.egg/reviewboard/diffviewer/diffutils.py",
line 374, in get_patched_file
return patch(filediff.diff, buffer, filediff.dest_file)
File "/usr/lib/python2.4/site-packages/ReviewBoard-1.6.3-py2.4.egg/reviewboard/diffviewer/diffutils.py",
line 239, in patch
raise Exception(_("The patch to '%s' didn't apply cleanly. The
temporary " +
Exception: The patch
to 'trunk/CommonAPI/CommonC/Include/C:/WORK/NEW_ARCH/eng-mfg-apps-repos/CommonAPI/CommonC/Include/controller.h'
didn't apply cleanly. The temporary files have been left
in '/tmp/reviewboard.2w3jya' for debugging purposes.
`patch` returned: patching file /tmp/reviewboard.2w3jya/tmppG_cQF
Hunk #1 FAILED at 30.
Hunk #2 FAILED at 53.
Hunk #3 FAILED at 67.
Hunk #4 FAILED at 165.
4 out of 4 hunks FAILED -- saving rejects to file
/tmp/reviewboard.2w3jya/tmppG_cQF-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.