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

Re: svn commit: r34686 - block committing inside a tree conflict

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Fri, 12 Dec 2008 10:37:04 +0000

On Thu, 2008-12-11 at 19:06 -0800, Neels Janosch Hofmeyr wrote:
> Author: neels
> Date: Thu Dec 11 19:06:15 2008
> New Revision: 34686
>
> Log:
> Properly error on a commit attempted anywhere inside a tree-conflicted
> working copy directory.
>
> * subversion/libsvn_client/commit_util.c
> (bail_on_tree_conflicted_ancestor): New helper function.

Neels,

Thanks for doing that.

Is there any way to combine this function and
subversion/libsvn_wc/update_editor.c:already_in_a_tree_conflict() ?

They seem to be doing the same thing, just in different ways.

- Julian

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=983328
Received on 2008-12-12 11:37:26 CET

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