980: Not able to generate diff

pk.har*******@gmai***** (Google Code) (Is this you? Claim this profile.)
March 24, 2009
What's the URL of the page containing the problem?


What steps will reproduce the problem?
1.
2.
3.

What is the expected output? What do you see instead?
The expected output is a proper diff. But what I get is as follows:
The patch to 'Makefile' didn't apply cleanly. The temporary files have been 
left in '/tmp/reviewboard.zSvojh' for debugging purposes. `patch` returned: 
patching file /tmp/reviewboard.zSvojh/tmp_bsQFy Hunk #1 FAILED at 119. Hunk 
#3 FAILED at 325. 2 out of 3 hunks FAILED -- saving rejects to file 
/tmp/reviewboard.zSvojh/tmp_bsQFy-new.rej

Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/ReviewBoard-1.0alpha4-
py2.5.egg/reviewboard/diffviewer/views.py", line 145, in view_diff
    interdiffset, highlighting, True)[0]
  File "/usr/lib/python2.5/site-packages/ReviewBoard-1.0alpha4-
py2.5.egg/reviewboard/diffviewer/diffutils.py", line 619, in get_diff_files
    large_data=True)
  File "/usr/lib/python2.5/site-packages/Djblets-0.5alpha3-
py2.5.egg/djblets/util/misc.py", line 143, in cache_memoize
    data = lookup_callable()
  File "/usr/lib/python2.5/site-packages/ReviewBoard-1.0alpha4-
py2.5.egg/reviewboard/diffviewer/diffutils.py", line 618, in <lambda>
    enable_syntax_highlighting),
  File "/usr/lib/python2.5/site-packages/ReviewBoard-1.0alpha4-
py2.5.egg/reviewboard/diffviewer/diffutils.py", line 342, in get_chunks
    new = get_patched_file(old, filediff)
  File "/usr/lib/python2.5/site-packages/ReviewBoard-1.0alpha4-
py2.5.egg/reviewboard/diffviewer/diffutils.py", line 258, in 
get_patched_file
    return patch(filediff.diff, buffer, filediff.dest_file)
  File "/usr/lib/python2.5/site-packages/ReviewBoard-1.0alpha4-
py2.5.egg/reviewboard/diffviewer/diffutils.py", line 127, in patch
    (filename, tempdir, patch_output))
Exception: The patch to 'Makefile' didn't apply cleanly. The temporary 
files have been left in '/tmp/reviewboard.zSvojh' for debugging purposes.
`patch` returned: patching file /tmp/reviewboard.zSvojh/tmp_bsQFy
Hunk #1 FAILED at 119.
Hunk #3 FAILED at 325.
2 out of 3 hunks FAILED -- saving rejects to file 
/tmp/reviewboard.zSvojh/tmp_bsQFy-new.rej

What operating system are you using? What browser?
XP and Chrome

Please provide any additional information below.
None
#1 pk.har*******@gmai***** (Google Code) (Is this you? Claim this profile.)
The diff was generated using TortoiseCVS
chipx86
#2 chipx86
Try using post-review or standard cvs. If it's anything like TortoiseSVN, the diff
generated is actually incompatible with us.
  • +NeedInfo
#3 pk.har*******@gmai***** (Google Code) (Is this you? Claim this profile.)
I ran the diff in unix and then loaded the diff file, its working fine. Thanks for 
your support.
david
#4 david
  • -NeedInfo
    +UserError