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

Re: Better merge support

From: Chia-Liang Kao <clkao_at_clkao.org>
Date: 2004-05-26 02:16:50 CEST

There has been history-sensitive merge support in svk handling simple
mutual-merge case as well as real-world complicated multi-branch case.

People who want the feature might want to try svk out. The current
algorithm can be a prototype that Subverson could use in the future
if it is considered proven.

You could use the merge feature of svk with any existing Subversion


On Tue, May 25, 2004 at 08:43:13AM -0700, Dmitry wrote:
> One thing, I am interesting about, is a "Better merge support". This feature is
> scheduled after 1.0 release. However, there is no corresponding issue in issuezilla.
> Do you intend to implement this in the nearest feature?
> Yes, Subversion does merge a little better than CVS, but nevertheless it is tricky
> and leads to errors. IMHO, this feature is very important for collaborative work.
> It would be great if you could set higher priority to the subj.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed May 26 02:17:09 2004

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

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