Question

I have two branches for which the merge was done using STS. Now we found out that there are is some content which was not merged.
So we find the missing revisions using this command

svn mergeinfo –show-revs eligible http://mybase.branch.1 http://mytrunk.branch

I get a list of revisions. Now I would like to see the content which was not merged excluding certain files like pom.xml , properties file.

svn diff is not able to help out.

How can I do it ?

Answer 1

Make a new and clean checkout of the branch. Merge all changes from the trunk on this branch. Do not commit anything! Revert files you are not interested in. Examine the changes in the working directory. Example:

svn checkout http://svn.example.org/svn/foobar/branches/0.42 foobar
cd foobar
svn merge ^/trunk

After these commands, the working directory contains all changes (uncommitted) that have not been merged onto the branch. You can use most SVN client to examine the changes – and revert some of them to ignore them.

You can do a lot of operations from the command line. The following command lines (bash, Linux) reverts all changes made to files named “pom.xml”:

svn revert $( find -name pom.xml )

The following command line reverts all files except Java files (bash, Linux):

svn revert $( find -type f ! -name \*.java )

You can also use the command line tool to examine the remaining changes, e.g.:

svn status
svn diff