[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Smarter Merging?

From: <kfogel_at_collab.net>
Date: 2004-12-08 17:11:31 CET

"Fazekas, Miklós" <boga@mac.com> writes:
> Then why don't you solve the simplest/most common issue of them:
> repeated merge.
> CVSNT has a partial solution for repeated merge and we're very happy
> with it.
> Unitl SVN has some solution we're stuck with CVSNT.
> If subversion want's to be a compelling replacement for the CVSNT,
> then there has to be some support for repeated merge.

It's a question of when, not if.

We started out with a very similar plan for repeated merge handling.
If you read our original design documents, you'll see some very
familiar stuff there. Then when we tried to get down to details, we
discovered we were naive, and that the problem required a lot more
thought/research. So, we decided to focus on matching CVS (not CVSNT,
not ClearCase, not BitKeeper, etc) first, and put off merge tracking
for a while.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Dec 8 17:33:36 2004

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.