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

Re: tree conflicts with replace

From: Neels Janosch Hofmeyr <neels_at_elego.de>
Date: Thu, 13 Aug 2009 20:31:09 +0200

Hi Bill,

to keep the replace indivisible serves clarity and integrity of code
semantics. You can always revert the whole replace and do a delete yourself
after that.

After a revert, the user should be sure that what is seen in the working
copy corresponds with BASE, the state from last `update'.

So, in the case where an incoming replace was downloaded during the update
(which caused a tree-conflict) and I then `revert' the node in question, the
working copy should show the new file from the repos.

etc., I don't think splitting that up is a good idea. That would be better
implemented as a separate command like `svn undo'. Patches welcome :P

~Neels

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2383407

Received on 2009-08-13 20:33:33 CEST

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