SVN 'Merge From...' not showing most recent branches
Answered
The SVN "Merge From.." feature is awesome - when it works. I have configured my branches and can easily update a bug branch from trunk, and I can also merge a bug/feature branch back into my trunk working copy of trunk. However, sometimes my bug branch does not show up in the "Merge From..."->"bugs..." list. It seems that the list of bug branches is not up to date. I try clicking the "Refresh" button, but the list is still out of date. How do I get the list to have all of the branches?
Edit: Resolved. The refresh button in that SVN window does not refresh the branches, but if you scroll to the bottom of the list of branches there is a different refresh button. That button will refresh the branches.
Please sign in to leave a comment.
Please clarify the structure of your branches, and what you have configured in the Configure Branches dialog.
On SVN, we have have a trunk, bugs, and branches folder (and tools in this case), with sub folders for individual bug branches.
I can merge in trunk by using "Merge From..."-> "trunk", and it often works for merging a bug/feature folder into a trunk working copy by using "Merge From..."->"bugs..."
But the list of sub-folders in "bugs" is not always complete.
There is another bug branch that is newer, and I cannot find it anywhere in that list. I can merge it in by using the SVN command line, so I know the branch is correct, it just doesn't show up.
I assumed I could click that 'Refresh' link thing, but the specific bug branch still does not show up. Any idea what I'm missing?
If the list of branches is long enough, it should become a scrollable list.
A scrollbar should appear as well, but maybe for some reasons it has not? Are you sure you cannot scroll the list to see other branches?
The scroll bar is visible (it's just mostly transparent), and I can scroll through it with my mouse wheel. The item I was looking for isn't anywhere on the list.
However, I just decided to click the refresh button again:
I had assumed that refresh button A would refresh the branches, but it didn't, so I thought the feature was broken and I didn't bother with option B. I tried clicking B and it worked. So thanks, PEBCAK issue fixed, but I would argue the UI is a bit misleading. Thank you!