Misleading piece in Subversion Design doc

I was recently reading the SVN design document, and noticed this paragraph:

=====
Better merging
--------------

Subversion remembers what has already been merged in and what hasn't,
thereby avoiding the problem, familiar to CVS users, of spurious
conflicts on repeated merges.

For details, *Note Merging and Ancestry::.
=====

Is this true? So does subversion *REALLY* remember what has already been
merged in?? That is my number one desire, for svn to know what has already
been merged with what.

It seems insanely complicated and I will never be able to convince my
co-workers to use subversion as long as they have to manually track when they
last merged with the trunk branch (or any other, for that matter).

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Oct 15 19:01:16 2002