Searched refs:incoming_base (Results 1 – 1 of 1) sorted by relevance
360 const svn_string_t *incoming_base, in generate_conflict_message() argument363 if (incoming_base == NULL) in generate_conflict_message()395 SVN_ERR_ASSERT_NO_RETURN(incoming_base != NULL); in generate_conflict_message()410 if (svn_string_compare(original, incoming_base)) in generate_conflict_message()435 SVN_ERR_ASSERT_NO_RETURN(!svn_string_compare(original, incoming_base)); in generate_conflict_message()449 SVN_ERR_ASSERT_NO_RETURN(!mine || !svn_string_compare(mine, incoming_base)); in generate_conflict_message()455 SVN_ERR_ASSERT_NO_RETURN(!svn_string_compare(original, incoming_base)); in generate_conflict_message()518 const svn_string_t *incoming_base, in prop_conflict_new() argument532 incoming_base, scratch_pool); in prop_conflict_new()540 if (incoming_base == NULL) in prop_conflict_new()[all …]