comparison ja/intro.tex @ 790:ac38c95a2ace

Propagate 231c8469a0ec Removed a paragraph that is no longer true as of Subversion 1.5.

789:4cf1bbfe4d2c

%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.

Subversion$B$OMzNr$r9MN8$7$?%^!<%8$N5!G=$r7g$$$F$*$j!$@53N$K$I$N%j%S%8%g%s(B
$B$,%V%i%s%A4V$G%^!<%8$5$l$?$N$+%f!<%6<+?H$,%H%i%C%/$9$kI,MW$,$"$k!#%f!<%6(B
$B$,DI$$@Z$l$J$+$C$?>l9g$d4V0c$$$rHH$7$?>l9g!$I,MW$N$J$$%3%s%U%j%/%H$r<jF0(B
$B$G2r7h$9$k$3$H$K$J$k!%(BSubversion$B$O%U%!%$%k$d%G%#%l%/%H%j$,%j%M!<%`$5$l$F(B
$B$$$?>l9g$b%^!<%8$K<:GT$9$k!%%^!<%8%5%]!<%H$N<e$5$O(BSubversion$B$N:GBg$N<eE@(B
$B$N0l$D$G$"$k!%(B

%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
%compared with Subversion~1.4.3's \emph{ra\_local} file store, which is

790:ac38c95a2ace

%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.

%Subversion$B$OMzNr$r9MN8$7$?%^!<%8$N5!G=$r7g$$$F$*$j!$@53N$K$I$N%j%S%8%g%s(B
%$B$,%V%i%s%A4V$G%^!<%8$5$l$?$N$+%f!<%6<+?H$,%H%i%C%/$9$kI,MW$,$"$k!#%f!<%6(B
%$B$,DI$$@Z$l$J$+$C$?>l9g$d4V0c$$$rHH$7$?>l9g!$I,MW$N$J$$%3%s%U%j%/%H$r<jF0(B
%$B$G2r7h$9$k$3$H$K$J$k!%(BSubversion$B$O%U%!%$%k$d%G%#%l%/%H%j$,%j%M!<%`$5$l$F(B
%$B$$$?>l9g$b%^!<%8$K<:GT$9$k!%%^!<%8%5%]!<%H$N<e$5$O(BSubversion$B$N:GBg$N<eE@(B
%$B$N0l$D$G$"$k!%(B

%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
%compared with Subversion~1.4.3's \emph{ra\_local} file store, which is