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

Tree conflicts with local replacements and deletes

From: Erik Huelsmann <ehuels_at_gmail.com>
Date: 2006-09-28 21:06:10 CEST

Before 1.4.0, it wasn't possible to schedule replace-with-history
items in a working copy. Starting 1.4.0, that has become possible
(without breaking the working copy).

Before then, updates involving local deletes (deletes and
replace-without-history) would not obstruct an update, even when
content changes were received for the now-deleted item.

With 1.4.0, updates for replaced-with-history items report a 'Checksum
mismatch' error. This error comes from the fact that the client is
incorporating changes to the old file into a file with a completely
different identity.

The effect observed with 1.4.0 and replace-with-history items, tells
me we should have been treating replaced and deleted items receiving
updates as obstructions.

I'd like to change the update behaviour to the above.




To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Sep 28 21:06:25 2006

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.