I'm working on a feature branch in SVN and I'm trying to frequently bring in changes from the trunk so I don't get too out-of-date.
I've been using the command: svn merge ^/parent/branch/path
How do I get a clear list of the files that are both:
- Files that the parent branch updated.
- Files that I modiefied at some point since I made my branch.
The problem is that the working copy has ~3k source files. My branch changes only cover ~50 files.
The merge command is bringing in many updates to files unrelated to my work. This is OK. I trust SVN can update those fine.
However, I do want to manualy review merges to files that I've worked on in my branch.
How can I do this?
