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

Re: svn commit: r38896 - trunk/subversion/libsvn_client

From: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 20 Aug 2009 23:35:43 +0100

On Thu, Aug 20, 2009 at 02:55:04PM -0700, Stephen Butler wrote:
> Author: sbutler
> Date: Thu Aug 20 14:55:04 2009
> New Revision: 38896
>
> Log:
> Report duplicate tree conflict errors in just one place (follow-up
> to r38872).
>
> * subversion/libsvn_client/merge.c
> (tree_conflict_on_add): Remove redundant error handling.

> + /* A merge may send two separate tree-conflicts if the merge
> + replaces the item. This means merge will first set a tree-conflict
> + with an incoming "delete", and then one with an incoming "add". */
> + if (existing_conflict != NULL
> + && existing_conflict->action == svn_wc_conflict_action_delete
> + && conflict->action == svn_wc_conflict_action_add)

Won't the above check also need similar treatment as done in
r38841 and r38848 ?

Stefan

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2385832
Received on 2009-08-21 00:36:08 CEST

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