# HG changeset patch # User Sean Russell # Date 1219374456 14400 # Node ID 231c8469a0ec551c04cf5494b8057cee5c3499ac # Parent 4d2fb4251217004d1959ee0a1af996938a6ac994 Removed a paragraph that is no longer true as of Subversion 1.5. diff -r 4d2fb4251217 -r 231c8469a0ec en/intro.tex --- a/en/intro.tex Thu Aug 21 22:21:24 2008 +0200 +++ b/en/intro.tex Thu Aug 21 23:07:36 2008 -0400 @@ -373,14 +373,6 @@ learn to use the other. Both tools are portable to all popular operating systems. -Subversion lacks a history-aware merge capability, forcing its users -to manually track exactly which revisions have been merged between -branches. If users fail to do this, or make mistakes, they face the -prospect of manually resolving merges with unnecessary conflicts. -Subversion also fails to merge changes when files or directories are -renamed. Subversion's poor merge support is its single biggest -weakness. - Mercurial has a substantial performance advantage over Subversion on every revision control operation I have benchmarked. I have measured its advantage as ranging from a factor of two to a factor of six when