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

New issue 1154 by rahulkdey: View Diff did not work when ^M s are removed  
from the end of the lines of an XML file
http://code.google.com/p/reviewboard/issues/detail?id=1154

Removed ^M from the end of each lines of an XML file. Created the diff,
when clicked on View Diff Tab the following is displayed.

FF 3.0.10 is used.

The diff file is also attached.



The patch to 'settings_paloalto.xml' didn't apply cleanly. The temporary
files have been left in '/tmp/reviewboard.x7BQHG' for debugging purposes.
`patch` returned: patching file /tmp/reviewboard.x7BQHG/tmpHXGK8u patch:
**** malformed patch at line 34: - <repositories>

Traceback (most recent call last):
   File
"/usr/lib/python2.5/site-packages/ReviewBoard-1.0rc2-py2.5.egg/reviewboard/diffviewer/views.py",
line 152, in view_diff
     interdiffset, highlighting, True)
   File
"/usr/lib/python2.5/site-packages/ReviewBoard-1.0rc2-py2.5.egg/reviewboard/diffviewer/diffutils.py",
line 620, in get_diff_files
     large_data=True)
   File
"/usr/lib/python2.5/site-packages/Djblets-0.5rc1-py2.5.egg/djblets/util/misc.py",
line 143, in cache_memoize
     data = lookup_callable()
   File
"/usr/lib/python2.5/site-packages/ReviewBoard-1.0rc2-py2.5.egg/reviewboard/diffviewer/diffutils.py",
line 619, in <lambda>
     enable_syntax_highlighting),
   File
"/usr/lib/python2.5/site-packages/ReviewBoard-1.0rc2-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.0rc2-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.0rc2-py2.5.egg/reviewboard/diffviewer/diffutils.py",
line 127, in patch
     (filename, tempdir, patch_output))
Exception: The patch to 'settings_paloalto.xml' didn't apply cleanly. The
temporary files have been left in '/tmp/reviewboard.x7BQHG' for debugging
purposes.
`patch` returned: patching file /tmp/reviewboard.x7BQHG/tmpHXGK8u
patch: **** malformed patch at line 34: -      <repositories>






Attachments:
        19244  1.6 KB

--
You received this message because you are listed in the owner
or CC fields of this issue, or because you starred this issue.
You may adjust your issue notification preferences at:
http://code.google.com/hosting/settings

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