Find the difference between a trunk and a branch?

Question

Is there any way to find the differences between trunk and say branch 0.4.x ?

I need to create a tag, but I can’t remember if my last corrections were in a tube or branch.

Answer 1

If you have a check from the repository, you can use the ^ (carriage, find it in the manual ) notation to refer to the repo root:

 svn diff --old ^/branches/0.4.x --new ^/trunk 

This works with Subversion 1.6.

If you have older subversion or no convenient repo checker, you can use absolute paths as described in the original redbook :

 svn diff --old http://.../repo/branches/0.4.x --new http://.../repo/trunk/ 

should give you the answer you are looking for.

Replace http://.../repo/ actual URL of your repository.

Answer 2

 svn diff ^/trunkUrl/fileName ^/branchUrl/fileName 

This will give you the difference between the file in the branch and the trunk.

Answer 3

You can use the meld tool to compare instead of using the command line to see the difference. It looks something like this.

 svn diff --diff-cmd='meld' --old http://.../repo/branches/0.4.x --new http://.../repo/trunk/ 

Answer 4

If you just want to distinguish from the current branch, you can just use a dot.

 svn switch ^/branches/branchName svn diff . ^/trunk