Searched refs:merged_prop (Results 1 - 2 of 2) sorted by relevance

/freebsd-10.3-release/contrib/subversion/subversion/svn/
H A Dconflict-callbacks.c372 svn_stream_t *merged_prop;
377 merged_prop = svn_stream_from_aprfile2(file, TRUE /* disown */,
379 SVN_ERR(merge_prop_conflict(merged_prop, desc, NULL, scratch_pool));
380 SVN_ERR(svn_stream_close(merged_prop));
371 svn_stream_t *merged_prop; local
/freebsd-10.3-release/contrib/subversion/subversion/libsvn_wc/
H A Dprops.c801 svn_boolean_t merged_prop = FALSE;
826 merged_prop = TRUE;
832 if (!merged_prop)
1059 svn_boolean_t merged_prop = FALSE;
1096 merged_prop = TRUE;
1100 if (!merged_prop)
799 svn_boolean_t merged_prop = FALSE; local
1057 svn_boolean_t merged_prop = FALSE; local

Completed in 169 milliseconds