diff -Nr格式的patch怎么打

dulao5

大家好, 我试着鼓捣Ion , 有个Ion的patch文件, 怎么打都打不上.

仔细试了一下, 这个patch文件内的diff命令参数是diff -rN , 不是diff -rNu

1. 
   
2. [dzg@dev ~]$ cd tmp/
   
3. [dzg@dev tmp]$ mkdir -p aaa aaafix
   
4. [dzg@dev tmp]$ echo -ne "test\ntest2\n" > aaafix/test.txt
   
5. [dzg@dev tmp]$ echo -ne "test\n" > aaa/test.txt
   
6. [dzg@dev tmp]$ diff -rN aaa aaafix
   
7. diff -rN aaa/test.txt aaafix/test.txt
   
8. 1a2
   
9. > test2
   
10. [dzg@dev tmp]$ diff -rN aaa aaafix > test.diff
    
11. [dzg@dev tmp]$ patch -p0 -i test.diff
    
12. patch: **** Only garbage was found in the patch input.
    
13. [dzg@dev tmp]$ patch -p1 -i test.diff
    
14. patch: **** Only garbage was found in the patch input.
    
15. [dzg@dev tmp]$ cd aaa
    
16. [dzg@dev tmp]$ patch -p1 -i ../test.diff
    
17. patch: **** Only garbage was found in the patch input.
    
18. 
    

复制代码

请问怎么办呢?

或者我想问:   一个diff -rN 生成的patch文件 , 能不能方便的转成 diff -Nur 那样格式的patch文件?