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

Re: [PATCH] Add error msg when trying to launch external merge tool on prop conflict

From: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 12 Nov 2009 23:02:34 +0100

On Thu, Nov 12, 2009 at 09:08:49PM +0100, Daniel Näslund wrote:
> [[[
> * subversion/svn/conflict-callbacks.c
> (svn_cl__conflict_handler): Add error message when trying to launch
> an external merge tool for a property conflict.
>
> Patch by: Daniel Näslund <daniel{_AT_}longitudo.com>
> ]]]
>
> I haven't run make check on this one. There is no tests for the
> interactive conflict resolver.
>
> Attaching a script for testing. The msg should be printed when typing
> 'l' for launch.

Thanks a lot, r40491.

Stefan

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2417285
Received on 2009-11-12 23:02:52 CET

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