• Home
  • History
  • Annotate
  • Raw
  • Download
  • only in /freebsd-12-stable/contrib/subversion/subversion/libsvn_client/

Lines Matching refs:mergeinfo

45 #include "mergeinfo.h"
76 /* Extend the mergeinfo for the single WC path TARGET_WCPATH, adding
77 MERGEINFO to any mergeinfo pre-existing in the WC. */
80 apr_hash_t *mergeinfo,
86 /* Get a fresh copy of the pre-existing state of the WC's mergeinfo
91 /* Combine the provided mergeinfo with any mergeinfo from the WC. */
92 if (wc_mergeinfo && mergeinfo)
93 SVN_ERR(svn_mergeinfo_merge2(wc_mergeinfo, mergeinfo, pool, pool));
95 wc_mergeinfo = mergeinfo;
1153 svn_string_t *mergeinfo; /* the new mergeinfo for the target */
1242 if (path_info->mergeinfo)
1245 path_info->mergeinfo,
1255 if (path_info->mergeinfo)
1258 path_info->mergeinfo,
1481 apr_hash_t *mergeinfo;
1503 /* Go ahead and grab mergeinfo from the source, too. */
1506 &mergeinfo, ra_session,
1509 if (mergeinfo)
1510 SVN_ERR(svn_mergeinfo_to_string(&info->mergeinfo, mergeinfo, pool));
2131 apr_hash_t *mergeinfo, *wc_mergeinfo;
2144 /* Set the mergeinfo for the destination to the combined merge
2146 /* Repository mergeinfo (or NULL if it's locally added)... */
2149 &mergeinfo, ra_session, src_origin->url, src_origin->rev,
2152 mergeinfo = NULL;
2153 /* ... and WC mergeinfo. */
2157 if (wc_mergeinfo && mergeinfo)
2158 SVN_ERR(svn_mergeinfo_merge2(mergeinfo, wc_mergeinfo, iterpool,
2160 else if (! mergeinfo)
2161 mergeinfo = wc_mergeinfo;
2163 if (mergeinfo)
2165 /* Push a mergeinfo prop representing MERGEINFO onto the
2172 SVN_ERR(svn_mergeinfo_to_string(&prop_value, mergeinfo,
2363 * Remove any incoming 'svn:mergeinfo' properties.
2807 /* Record the implied mergeinfo. */
2816 /* ### Maybe the notification should mention this mergeinfo change. */