1724: error when trying to view diff for create_gse_esl.mac

andre******@gmai***** (Google Code) (Is this you? Claim this profile.)
March 21, 2011 
What version are you running?

I don't know which version -- please include instructions in this form on how to determine this.

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?

I'm trying to view the diff of the file attached here, and instead I'm getting this error:

The patch to '//Adams/Dev/ADAMSDEV/source/controls/bld_gui/create_gse_esl.mac' didn't apply cleanly. The temporary files have been left in '/tmp/reviewboard.50tn3p' for debugging purposes. `patch` returned: patching file /tmp/reviewboard.50tn3p/tmpXpXne6 Hunk #13 FAILED at 611. 1 out of 13 hunks FAILED -- saving rejects to file /tmp/reviewboard.50tn3p/tmpXpXne6-new.rej

Traceback (most recent call last):
  File "/usr/local/lib/python2.5/site-packages/ReviewBoard-1.0-py2.5.egg/reviewboard/diffviewer/views.py", line 152, in view_diff
    interdiffset, highlighting, True)
  File "/usr/local/lib/python2.5/site-packages/ReviewBoard-1.0-py2.5.egg/reviewboard/diffviewer/diffutils.py", line 623, in get_diff_files
    large_data=True)
  File "/usr/local/lib/python2.5/site-packages/Djblets-0.5-py2.5.egg/djblets/util/misc.py", line 143, in cache_memoize
    data = lookup_callable()
  File "/usr/local/lib/python2.5/site-packages/ReviewBoard-1.0-py2.5.egg/reviewboard/diffviewer/diffutils.py", line 622, in <lambda>
    enable_syntax_highlighting),
  File "/usr/local/lib/python2.5/site-packages/ReviewBoard-1.0-py2.5.egg/reviewboard/diffviewer/diffutils.py", line 345, in get_chunks
    new = get_patched_file(old, filediff)
  File "/usr/local/lib/python2.5/site-packages/ReviewBoard-1.0-py2.5.egg/reviewboard/diffviewer/diffutils.py", line 261, in get_patched_file
    return patch(filediff.diff, buffer, filediff.dest_file)
  File "/usr/local/lib/python2.5/site-packages/ReviewBoard-1.0-py2.5.egg/reviewboard/diffviewer/diffutils.py", line 129, in patch
    (filename, tempdir, patch_output))
Exception: The patch to '//Adams/Dev/ADAMSDEV/source/controls/bld_gui/create_gse_esl.mac' didn't apply cleanly. The temporary files have been left in '/tmp/reviewboard.50tn3p' for debugging purposes.
`patch` returned: patching file /tmp/reviewboard.50tn3p/tmpXpXne6
Hunk #13 FAILED at 611.
1 out of 13 hunks FAILED -- saving rejects to file /tmp/reviewboard.50tn3p/tmpXpXne6-new.rej




What operating system are you using? What browser?

WinXP SP3, win32, Firefox 3.6.6


Please provide any additional information below.
create_gse_esl.mac 
!USER_ENTERED_COMMAND mdi controls dll_gse_creation
!$model:t=model:A
!$gsename:t=string:c=1:d=""
!$full_dll_name:t=string:c=1:d=""
!$to_gse:t=Plant_Output:c=1:d=(none)
!$from_gse:t=Plant_Input:c=1:d=(none)
!$static_hold:t=list(on,off):u=off
!$if_confirm:t=list(on,off):c=1:u=on
!
!OUTLINE OF THE MAIN TASKS PERFORMED IN THIS MACRO
!
!1. create macro variables
!2. get root name of External System Library
!3. get top dir of Adams installation
!4. Load the ESL to query information
!5. get the name of the ESL and the length of the string
!6. create a U array if POUTPUT exists
!7. create a Y arrays if PINPUT exists
!8. query number of continouous and discrete states
!9. create continuous state array (X) and initial conditions array (IC) if continuous states exist
!10. create discrete state array (XD) and initial conditions array (ICD) if discrete states exist
!11. create base GSE and add entities to it as required
!12. add U array to GSE if POUTPUT exists
!13. add X, I
david
#1 david 
This is something that you'll have to work with your server admin to track down. Typically it's a result of bad character encoding or an improperly-formatted diff.
  • +UserError