[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: Fri, 14 Aug 2009 17:14:42 +0200

Stefan Sperling wrote:
> On Fri, Aug 14, 2009 at 04:16:30AM +0200, Neels Janosch Hofmeyr wrote:
>> So, someone merges from a branch, gets a conflict with an incoming replace.
>>
>> The 'revert' step is then useful as a resolving strategy of "wipe, get a
>> clean slate, re-apply local changes manually". In that case, the merge would
>> be carried out and recorded correctly.
>
> Unless maybe if the file has explicit mergeinfo?

Well, incoming mergeinfo should be preserved. If there is explicit mergeinfo
uncommitted in the working copy, sure. But isn't that what "revert" is
supposed to be? What are we discussing, again?

~Neels

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

Received on 2009-08-14 17:17:18 CEST

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