svn複製和編輯差異和補丁中的捕獲

Question

如何捕獲一個svn副本，然後在diff中進行編輯以將其重新應用爲另一臺機器中的補丁？

svn copy a.txt b.txt 
vim b.txt <== some edits 
svn diff <== this doesn't capture the copy - 
    but treats it as edit only causing problem with patch -p0 

Answer 1

svn diff --notice-ancestry 

默認情況下svn diff不看文件的祖先，所以，當你只需要輸入svn diff它正在尋找在倉庫裏面的相同目錄下的文件名b.txt。使用--notice-ancestry選項可使b.txt與存儲庫中的a.txt不同。請注意，要在另一臺機器上實際執行修補程序，首先需要執行相同的svn copy命令，因爲b.txt將不存在。