362: SVN patch fails in the presence of svn:keywords

cuv****@gmai***** (Google Code) (Is this you? Claim this profile.)
chipx86
 chipx86
Feb. 25, 2008 
What's the URL of the page containing the problem?
/r/#/diff/

What steps will reproduce the problem?
1. Modify a file near a marker that's in svn:keywords
2. Create a patch with 'svn diff'
3. Create a new review request, and go to 'View Diff'

What is the expected output? What do you see instead?
Expect a normal diff output.  Get an exception instead:
  The patch to 'FILENAME' didn't apply cleanly...

Please provide any additional information below.
'svn cat' will expand special variables in svn:keywords, but 'svn diff'
doesn't expand anything.  This causes the patch to fail if those variables
appear in the patch context.

I've attached a testcase that demonstrates the issue. There's a patch and a
tarball, since the SVN test repo needs binary updates.
rb-svn-keywords-test.patch 
Index: scmtools/testdata/svn_repo/db/revs/3
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: scmtools/testdata/svn_repo/db/revs/3
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream
Index: scmtools/testdata/svn_repo/db/revprops/3
===================================================================
--- scmtools/testdata/svn_repo/db/revprops/3	(revision 0)
+++ scmtools/testdata/svn_repo/db/revprops/3	(revision 0)
@@ -0,0 +1,14 @@
+K 10
+svn:author
+V 7
+jistone
+K 8
+svn:date
+V 27
+2008-01-16T21:45:46.713709Z
+K 7
+svn:log
+V 29
+Add an $Id$ tag to the file.
+
+END
Index: scmtools/testdata/svn_repo/db/current
===================================================================
--- scmtools/testdata/svn_repo/db/current	(revision 1120)
+++ scmtools/testdata/svn_repo/db/current	(working copy)
@@ -1 +

 






 

  rb-svn-keywords-test.tar.gz
  



    
     
    


  

 


 

  

 






  


 










 

  

   chipx86

  

 
 

  

    
     

   
   #1
   chipx86


  



  
    


   
  • 
    
    
    -Priority-Medium
    +Priority-High
    +Component-DiffParser
    +Milestone-Release1.0
    
   
    • 



   
  • 
    
    
    +chipx86
    
   
    • 


  


 








 

   

 
 

  

    
     

   
   #2
   alexei.a*********@gmai***** (Google Code)



(Is this you? Claim this profile.)


  


  
Will there be any progress on this bug? It's really annoying!



 








 

  

   chipx86

  

 
 

  

    
     

   
   #3
   chipx86


  



  
    


   
  • 
    
    
    +Fixed
    
   
    •