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

Re: Re[2]: Merge of deleted file with a modified one

From: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: 2006-01-12 14:49:55 CET

On 1/12/06, Alexey Yudichev <ayud@newmail.ru> wrote:
> > See issue 2282:
> > http://subversion.tigris.org/issues/show_bug.cgi?id=2282
> I know that merge that happens during "svn update" is different to the one
> that happens during "svn merge". Does the enhancement 2282 include
> improvement to the "svn merge" merging algorithm? The bug description
> does not say anything about it.
>

It's the same algorithm, for the most part. The only difference is
that 'svn merge' doesn't affect your text-bases, and 'svn update'
does. But that issue is meant to apply to both operations.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jan 12 15:12:22 2006

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