> > > > What command(s) should I use to bring in the "libcomplex/2.0" changes but > > identify the all files I ever messed with? > > These are two separate operations. > > [snip] > > $ svn merge ^/vendor/libcomplex/1.0 \ > ^/vendor/libcomplex/2.0 \ > libcomplex > > [snip] > > And then subsequently modified your copy in "calc" in some way and committed > those changes, you can see which files you changed using this command: > > $ svn diff --summarize \ > http://svn.example.com/repos/vendor/libcomplex/1.0 \ > http://svn.example.com/repos/calc/libcomplex > >
Thank you for the help. It's that last diff command that comes too late for my taste, though. I'd like to avoid checking in the "libcomplex/2.0"->project merge before doing a review. 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"? David
