2 ms·
> and a great way to handle merges Nope. That took a very long while to be added. When the current crop of DVCS started appearing, one of their significant dra
by masklinn 4y ago
> and a great way to handle merges
Nope. That took a very long while to be added. When the current crop of DVCS started appearing, one of their significant draw was actually that by necessity merges worked well. At the time, SVN made it extremely easy to fork branches, and almost impossible to merge them.
Per the official doc (https://svnbook.red-bean.com/en/1.7/svn.branchmerge.basicmerging.html https://svnbook.red-bean.com/en/1.7/svn.branchmerge.basicmer...) merge tracking was introduced in subversion 1.5, released in May 2008. That's 3 years after the initial release of Git, Mercurial, and Bazaar.
Before then you had to keep note of what you'd merged by hand so you didn't double merge it, and that was distinctly not fun.