Search code examples
svndiffrevision

svn: How do I see what files have changed between two revisions (ignoring intermediate versions)

I have the following history for my branch of a project:

  • 3780 -- an update I did
  • 3803 -- merged from a coworker's branch
  • 3804 -- added a few minor features
  • 3805 -- did a reverse merge of 3803, after finding out the coworker's branch had problems

Is there a way I can find out which files were changed between revision 3780 and 3805, without being misled by files which have changed back to their original state? I am trying to verify that the net effect of 3780->3805 is a relatively small set of changes.

e.g. if file X.cpp changed in r3803 and then changed back in r3805 to the same state as in 3780, I need to not see X.cpp in my diff.

NOTE: This is not the same as How do I see what files were changed between 2 revisions?, the answers of which state which files have been changed in any of the revisions between the start and end.

Solution

  • You can do:

    svn diff -r 3780:3805 .

    Assuming you are at the directory where you would like to perform this.