I\'ve been using various source control systems for a while, but when it comes to reverting changes I\'m not yet an expert. Can someone help given this scenario:
check out current version, then svn merge -r 5:4 file1 file2 (that's from memory, and might not be totally correct)