3 ms·

Subversion sucked for a lot of reasons. It had no good integration with code review (though there are some tools that can do it now). It didn't have a good way

Subversion sucked for a lot of reasons. It had no good integration with code review (though there are some tools that can do it now). It didn't have a good way of doing a three-way merge, necessary for rebasing a change or porting it across branches (e.g. release branches for shrinkwrap patch updates, which was the style at the time), without additional tooling. I wouldn't model how trunk-based development works based on experience with SVN.

flohofwoe 3y ago
TortoiseSVN+WinDiff took a lot of pain out of SVN merging, but in general with the trunk-based approach you'd usually only create 'dead-end' branches off the trunk which would not be merged back (for instance one maintenance branch per feature release to enable further patch-releases without holding up work on the next feature release already happening on trunk), in this case, only bugfixes would be cherry-picked in either direction (e.g. the most important rule for SVN was: avoid complex merge scenarios in the first place).