Re: tree conflicts with replace

From: Stefan Sperling <stsp_at_elego.de>
Date: Fri, 14 Aug 2009 07:04:40 +0100

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?

Stefan

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2383534
Received on 2009-08-14 08:05:39 CEST

This message: [ Message body ]
Next message: Stefan Sperling: "Re: [PATCH] issue 3459 - svn patch does not tolerate empty lines"
Previous message: Daniel Näslund: "Re: [PATCH] issue 3459 - svn patch does not tolerate empty lines"
In reply to: Neels Janosch Hofmeyr: "Re: tree conflicts with replace"
Next in thread: Neels Janosch Hofmeyr: "Re: tree conflicts with replace"
Reply: Neels Janosch Hofmeyr: "Re: tree conflicts with replace"

Contemporary messages sorted: [ by date ] [ by thread ] [ by subject ] [ by author ] [ by messages with attachments ]