• 
  
    
 
    
 
    

    



    
    
    
    
     
    




    
 
    

  
    



    
 

 

  

  

 

    


  
    





    
 
    



  

    
 
 
    
  
    Issue 3248: rbt: svn client incorrectly detects "history scheduled with commit", always requires --svn-show-copies-as-adds=y/n
    
 
    

    



 
    
 
    

  Review Request #5471
  —
  Created Feb. 14, 2014 and submitted 

 
    


    




    




    




 
    
  
    
   Information

  
    



    
 
 
    
  vladr
 
    

    





    
 
 
    
  RBTools
 
    

    





    
 
 
    
  
 
    

    





    
 
 
    
  
 
    

    





    
 
 
    
  
 
    

    



 
    



 
    
  
    
   Reviewers

  
    



    
 
 
    
  rbtools
 
    

    





    
 
 
    
  
 
    

    



 
    



    


    
 
    




  

    
 
 
    
  
    Scenario:
    
1. add a new file X to branch BrA, commit
    
2. svn merge X from branch BrA to branch BrB in working copy (status "A +")
    
3. modify file Y in working copy, send ONLY file Y (status "M) to changelist CL
    
4. rbt post --svn-changelist=CL
    

    Expected: post succeeds, because changelist only contains modified files
    
Actual: post fails with "Please try again with '--svn-show-copies-as-adds=y/n'"; this is because rbt "sees" file X, despite explicitly only posting Y for review.
    

    This patch modifies history_scheduled_with_commit in rbtools/clients/svn.py to pass the --changelist option, if present, down to 'svn st'
    
 
    

    





  

    
 
 
    
  
    The scenario described above now works as expected.
    
 
    

    




 
    

    





    
 
    









 









 
    

    



  
    
 
    

    


    


 













    
 





 
    
  
    
   
    



david




   
    
   
    





    
  
    
 
    


 
    
  
    

   
    
   
    
    
     
david


    
    
   
    

  
    
  
    
  
    


      




    1. 
 
      
  
      
   
      I'm going to make a small change to pass the changelist name in directly (if present) instead of inspecting the diff cmdline, and then I'll push this. Thanks!
      
  
      
 
      

 
      
  


      
 
      
 
        

  

 
      


      

 
      

      2. 















    2. 
 
      
  
      
   
      
  
      
 
      

 
      
  


      
 
      
 
        

  

 
      


      

 
      

      3. 


    

  
    
 
    

    












    
 



 
    
  
    
   
    




 VL





   
    
   
    
  
    
 
    


 
    
  
    

   
    
   
    
    
     Review request changed
    
    
   
    

  
    
  
    
  
    




    

  
    
   
    
    Status:
   
    
   
    

    Completed

   
    
  
    



  
    
   
    
    Change Summary:
   
    
   
    
    
    Pushed to master (2d19868). Thanks!