My current working copy is /opt/project, this is the up to date copy of the branch from https://example.com/project/branches/branch_1. To pull changes that are committed to trunk back into my working copy, I have been running this command:
svn merge ^/trunk
This seemed to work in that it would update various files when commits happened. However, I just ran a full diff of trunk vs the branch and I am seeing a bunch of changes to files that I did not touch. Say: /opt/project/src/SomeFile.java
If I run the above command, no updates happen. If I run this command:
svn merge https://example.com/projects/trunk/src/SomeFile.java ./src/SomeFile.java
Then the changes are pulled in. I would expect the first command to pull in changes to anything in the project, but it seems I am doing something wrong.
Why does the first command seem to skip some files that I have not edited and doing a manual merge of these specific files correctly pull in the updates?