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

Re: reconstruct .svn (was: Re: checksumming crap)

From: <ghudson_at_MIT.EDU>
Date: 2003-01-25 19:36:03 CET

On Sat, 2003-01-25 at 13:12, solo turn wrote:
 i want to get the difference between HEAD and wc into the wc.
 using a 2-way-merge, the revision 100 is not important to me as end
 user.

A two-way merge between wc and head is a radically different operation
from the usual three-way merge performed by an update. It is much less
automated--it would require you to manually review every difference
between the wc and the head and remember it that difference reflects a
local change in your working copy or a change in the repository.

It's possible that you, personally, as an end user, want Subversion to
fall back on this kind of merging when it can't determine the base
revision. But that does not justify the kind of complexity it would
require for us to support it.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 14 02:17:43 2006

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