1. Arne Babenhauserheide
  2. hgbook

Commits

Bryan O'Sullivan  committed 635d7c0 Merge

Merge

  • Participants
  • Parent commits a168dae, 231c846
  • Branches default

Comments (0)

Files changed (1)

File en/intro.tex

View file
 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.
+Prior to version 1.5, Subversion had no useful support for merges.
+At the time of writing, its merge tracking capability is new, and known to be
+\href{http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.finalword}{complicated
+  and buggy}.
 
 Mercurial has a substantial performance advantage over Subversion on
 every revision control operation I have benchmarked.  I have measured