Author: stsp
Date: Wed Jun 24 16:04:19 2015
New Revision: 1687318
URL: http://svn.apache.org/r1687318
Log:
Follow-up to r1687290: Fix more test fallout.
* subversion/svn/info-cmd.c
(print_info) Don't use svn_client_conflict_text_get_contents() with non-text
conflicts.
Modified:
subversion/trunk/subversion/svn/info-cmd.c
Modified: subversion/trunk/subversion/svn/info-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/info-cmd.c?rev=1687318&r1=1687317&r2=1687318&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/info-cmd.c (original)
+++ subversion/trunk/subversion/svn/info-cmd.c Wed Jun 24 16:04:19 2015
@@ -591,18 +591,18 @@ print_info(void *baton,
APR_ARRAY_IDX(info->wc_info->conflicts, i,
const svn_wc_conflict_description2_t *);
const char *desc;
- const char *base_abspath;
- const char *my_abspath;
- const char *their_abspath;
+ const char *base_abspath = NULL;
+ const char *my_abspath = NULL;
+ const char *their_abspath = NULL;
- SVN_ERR(svn_client_conflict_text_get_contents(NULL, &my_abspath,
- &base_abspath,
- &their_abspath,
- conflict, pool,
- pool));
switch (svn_client_conflict_get_kind(conflict))
{
case svn_wc_conflict_kind_text:
+
+ SVN_ERR(svn_client_conflict_text_get_contents(
+ NULL, &my_abspath, &base_abspath, &their_abspath,
+ conflict, pool, pool));
+
if (base_abspath)
SVN_ERR(svn_cmdline_printf(pool,
_("Conflict Previous Base File: %s\n"),
