Hello,

 I've been reading:
http://svnbook.red-bean.com/en/1.7/svn-book.html#svn.advanced.vendorbr 
http://svnbook.red-bean.com/en/1.7/svn-book.html#svn.advanced.vendorbr&lang= 

 This looks great, but I have a question. (Assuming, per the examples, that I 
have local patches to "libcomplex-1.0")

 When I merge the updates from "/vendor/libcomplex/2.0" to my project 
trunk/branch I will have many updated files in that working copy prior to 
commit.

 Most of these updates I'd like to accept as-is, because they reflect the 
vendor's changes. However, I'd like carefully examine the files that I've 
previously patched just to ensure things still make sense or are required. 
(Even if SVN can "successfully" merge the changes.) 

 What command(s) should I use to bring in the "libcomplex/2.0" changes but 
identify the all files I ever messed with?

 Or am I missing something here?

 Thank you
 David

Reply via email to