hgbook
changeset 314:231c8469a0ec
Removed a paragraph that is no longer true as of Subversion 1.5.
author | Sean Russell <ser@ser1.net> |
---|---|
date | Thu Aug 21 23:07:36 2008 -0400 (2008-08-21) |
parents | 4d2fb4251217 |
children | 635d7c0fcac3 22ecadf9f413 |
files | en/intro.tex |
line diff
1.1 --- a/en/intro.tex Thu Aug 21 22:21:24 2008 +0200 1.2 +++ b/en/intro.tex Thu Aug 21 23:07:36 2008 -0400 1.3 @@ -373,14 +373,6 @@ 1.4 learn to use the other. Both tools are portable to all popular 1.5 operating systems. 1.6 1.7 -Subversion lacks a history-aware merge capability, forcing its users 1.8 -to manually track exactly which revisions have been merged between 1.9 -branches. If users fail to do this, or make mistakes, they face the 1.10 -prospect of manually resolving merges with unnecessary conflicts. 1.11 -Subversion also fails to merge changes when files or directories are 1.12 -renamed. Subversion's poor merge support is its single biggest 1.13 -weakness. 1.14 - 1.15 Mercurial has a substantial performance advantage over Subversion on 1.16 every revision control operation I have benchmarked. I have measured 1.17 its advantage as ranging from a factor of two to a factor of six when