> >> Ideally, after the merge (but before commit) I'd like to be able to run a > >> command like: > >> "svn diff --show-patches-to-vendor-code" > >> > >> Output: list of lib files that I've changed at any point since the > >> previous vendor drop. > >> > >> Could I do something like diff the (pre commit) project working copy > >> against "^/vendor/libcomplex/2.0"? > > > > [SNIP] > I think that last command needs the 2nd form of 'svn diff' syntax, > because you're comparing an (arbitrary) url with a working copy path: > > So that would be: > > $ svn diff --summarize \ > --old=http://svn.example.com/repos/vendor/libcomplex/2.0 \ > --new=path/to/workingcopyofcalc/libcomplex >
Interesting. Thank you. Couple of questions: 1. "--summarize" complains that it can only work on URL-URL diffs. Is there a work around? 2. Running without "--summarize" works, but I see a ton of "mergeinfo" entries like: Property changes on: Somefile ___________________________________________________________________ Modified: svn:mergeinfo Merged /branches/path/Somefile:r19415-19622 This is accurate I suppose (what's it indicate?), but gets in the way of seeing the list of patched files. i.e. "Somefile" is unrelated to any of my changes. Can this be suppresed? 3. Running the above diff also outputs lines related to some files that I know I never modifed, but did recive updates via the merge. Oddly, these are all binary files. Index: Path/to/bin.dat =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream What does this indicate? Thank you
