Lines Matching defs:original
383 const svn_string_t *original,
410 SVN_ERR_ASSERT_NO_RETURN(original != NULL);
424 if (original == NULL && mine != NULL)
434 SVN_ERR_ASSERT_NO_RETURN(original != NULL);
436 if (svn_string_compare(original, incoming_base))
461 SVN_ERR_ASSERT_NO_RETURN(!svn_string_compare(original, incoming_base));
477 if (original && mine && svn_string_compare(original, mine))
479 /* We have an unchanged property, so the original values must
481 SVN_ERR_ASSERT_NO_RETURN(!svn_string_compare(original, incoming_base));
489 if (original && mine)
496 if (original)
552 const svn_string_t *original;
570 original = maybe_prop_value(skel->next, scratch_pool);
575 buf = generate_conflict_message(propname, original, mine, incoming,
586 if (original == NULL)
589 original = incoming_base;
591 original = svn_string_create_empty(scratch_pool);
593 else if (incoming_base && svn_string_compare(original, mine))
594 original = incoming_base;
598 original_is_binary = svn_io_is_binary_data(original->data, original->len);
608 SVN_ERR(svn_diff_mem_string_diff3(&diff, original, mine, incoming,
618 svn_string_create(svn_utf_cstring_from_utf8_fuzzy(original->data,