Re: Misleading piece in Subversion Design doc

Colin D Bennett <cbennett@radsoft.com> writes:

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

The design document was written 2.5 years ago, a description of what
we expected svn to be....

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

... and we've not yet implemented it. It's a big feature that will
come after 1.0. But we know it's doable by using our
meta-data-properties.

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

Well, then, you better not use CVS, because it can't prevent the
"repeated merge" problem either. :-)

In practice, the status quo something we can live with for the moment.
It will be really nice when it's automated, though.

---------------------------------------------------------------------
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:16:28 2002