There are quite a few SVN commands that I do not use so often but that I need every once in a while. One of them is related to reintegrating a branch into the trunk.
Assuming that one is working with the trunk as a working copy and want to reintegrate the branch called feature, the reintegrate command is simply:
1
svn merge --reintegrate url://path/to/branches/feature .
This will calculate the diff between the last time the trunk was merge onto the branch and the latest version of the branch and apply it to the working copy. (Note that the illustration above is doing a reintegrate merge from one branch onto another branch and then merge back the branch to the trunk. This is slightly different that the case explained above but the idea behind remains the same.)
This method doesn’t come with a few drawbacks but for more information, simply refer to the source article below.
For the time being, comments are managed by Disqus, a third-party library. I will eventually replace it with another solution, but the timeline is unclear. Considering the amount of data being loaded, if you would like to view comments or post a comment, click on the button below. For more information about why you see this button, take a look at the following article.