subversion-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Philip Martin <philip.mar...@wandisco.com>
Subject Re: Segv in 1.8.0-rc2 used svn_client_status4 with a tree conflict
Date Mon, 03 Jun 2013 08:06:35 GMT
Barry Scott <barry@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

Mime
View raw message