subversion/libsvn_wc/props.c

98    been modified to combine it with incoming mergeinfo from the
361                           const svn_string_t *incoming,
368       SVN_ERR_ASSERT_NO_RETURN(incoming != NULL);
373           SVN_ERR_ASSERT_NO_RETURN(!svn_string_compare(mine, incoming));
394   if (incoming == NULL)
449      from the INCOMING_BASE; otherwise, the incoming change would have
461                                      "with the incoming change.\n"),
519                   const svn_string_t *incoming,
533   buf = generate_conflict_message(propname, original, mine, incoming,
540   if (incoming == NULL)
541     incoming = svn_string_create_empty(scratch_pool);
547      We have four sides: original, mine, incoming_base, incoming.
562        latest    incoming               right-hand side of merge
580   incoming_is_binary = svn_io_is_binary_data(incoming->data, incoming->len);
590       SVN_ERR(svn_diff_mem_string_diff3(&diff, incoming_base, mine, incoming,
597           const char *incoming_marker = _(">>>>>>> (incoming 'changed to' value)");
598           const char *incoming_base_marker = _("||||||| (incoming 'changed from' value)");
609             svn_string_create(svn_utf_cstring_from_utf8_fuzzy(incoming->data,
644   if (incoming->len > 0)
651         svn_stringbuf_appendbytes(buf, incoming->data, incoming->len);
680   const svn_string_t *incoming;
692   incoming = maybe_prop_value(skel->next->next->next, scratch_pool);
698                                            incoming, incoming_base,
1044                  incoming.  Combine those deltas, and apply
1066          incoming value relative to the base, and
1087              incoming.  Combine those deltas, and apply
1258   /* Looping over the array of incoming propchanges we want to apply: */
1329   /* Finished applying all incoming propchanges to our hashes! */