I am trying to merge the latest changes from trunk into a branch of my project, but the problem is I don't know what revision of the trunk I checked out that I eventually created the branch from. I would think SVN logged this somewhere. Does anyone know how I can find the revision number?
(In other words, the Subversion equivalent of git merge-base master branch-name
)
From the command line, the --stop-on-copy flag can be used to help show you where you copied a branch from:
svn log --stop-on-copy --verbose --limit 1 -r0:HEAD ^/branches/feature
(where feature
is the name of your branch)
The last line of will say something like this:
Changed paths:
A /branches/feature (from /trunk:1234)