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

Re: Segv in 1.8.0-rc2 used svn_client_status4 with a tree conflict

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Mon, 03 Jun 2013 09:06:35 +0100

Barry Scott <barry_at_barrys-emacs.org> writes:

> Index: /Users/barry/wc/svn/svn-1.8.x/subversion/libsvn_wc/tree_conflicts.c
> ===================================================================
> --- /Users/barry/wc/svn/svn-1.8.x/subversion/libsvn_wc/tree_conflicts.c (revision 1484244)
> +++ /Users/barry/wc/svn/svn-1.8.x/subversion/libsvn_wc/tree_conflicts.c (working copy)
> @@ -506,6 +506,7 @@
> return SVN_NO_ERROR;
> }
> }
> + *tree_conflict = NULL;
> return SVN_NO_ERROR;
> }

Committed to trunk and nominated for backport. Thanks! 

-- 
Certified & Supported Apache Subversion Downloads:
http://www.wandisco.com/subversion/download
Received on 2013-06-03 10:07:13 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.