Tips of svn diff

Since I have taken part in JAQL open source project, I need to use diff/patch to communicate with worldwide people.

 

I tried svn diff. There is one thing that confuses me. It is that the file adding and removing are not included in the result diff file. After playing more with it, I found the cuase. The files tagged with ? (not under version control) and the files tagged with ! (missing)  are not recognized by svn diff.

 

svn add

svn rm

 

After using svn add and svn rm to add and remove these files, new files are tagged with only A ("A +" does not work) and removed files are tagged with only D. Create the patch.

 

svn diff > JAQL.diff

 

They are include in the resulted diff file. Then in the root directory of source code, run

 

patch -E -p0 < JAQL.diff

 

You are done.

 

你可能感兴趣的:(SVN)