1154: View Diff did not work when ^M s are removed from the end of the lines of an XML file

rahu*****@gmai***** (Google Code) (Is this you? Claim this profile.)
July 26, 2009 
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>
19244 
--- settings_paloalto.xml  //depot/vdi/monza-rel/settings/settings_paloalto.xml#1
+++ settings_paloalto.xml  09-06-08 10:52:46
@@ -1,30 +1,30 @@
-<settings>
-  <proxies>
-    <proxy>
-      <id>VMware Proxy</id>
-      <active>true</active>
-      <protocol>http</protocol>
-      <host>proxy.vmware.com</host>
-      <port>3128</port>
-      <nonProxyHosts>local.net,some.host.com</nonProxyHosts>
-    </proxy>
-  </proxies>
-
-  <profiles>
-    <profile>
-      <id>m13repo</id>
-      <repositories>
-        <repository>
-            <id>m13</id>
-            <name>m13 Repository</name>
-	        <url>file:///C:/p4/depot/thirdparty</url>
-	        <layout>default</layout>
-	    </repository>
-      </repositories>
-    </profile>

 






  


 










 

  

   chipx86

  

 
 

  

    
     

   
   #1
   chipx86


  


  
This should be fixed in the nightlies for RC3. If you can give that a shot and
verify, that would help.



  
    


   
  • 
    
    
    +NeedInfo
    
   
    • 


  


 








 

  

   david

  

 
 

  

    
     

   
   #2
   david


  


  
Assuming fixed. Please let us know if not.



  
    


   
  • 
    
    
    -NeedInfo
    +Fixed
    
   
    •