All, is it still recommended to delete completed branches in subversion 1.8? The previous SO questions refer to version 1.7. In 1.8 there's no --reintegrate anymore.
Asked
Active
Viewed 232 times
1
-
The link in the accepted answer explicitly refers to being able to do further work in the branch. Is that the situation you mean? – Álvaro González Sep 30 '18 at 09:16
1 Answers
0
Although there is no option --reintegrate anymore in 1.8 it is still called reintegrating a branch.
The SVN book nigthly version for 1.8 states (bold by me):
Now that your private branch is merged to trunk, you may wish to remove it from the repository [svn delete on branch]. If you choose not to delete your branch after reintegrating it to the trunk you may continue to perform sync merges from the trunk and then reintegrate the branch again. If you do this, only the changes made on your branch after the first reintegrate are merged to the trunk.
Yeti
- 1,108
- 19
- 28
-
So it's possible to reintegrate the branch multiple times to trunk without doing any record merges in between? – chris Oct 01 '18 at 04:57
-
1As it says you need to sync your branch. As far as I understand to prevent big merge conflicts on the reintegration merge. Record-only merges wouldn't be helpful, I think ... – Yeti Oct 02 '18 at 18:50