Searched refs:merges (Results 1 - 6 of 6) sorted by relevance
/freebsd-10-stable/contrib/subversion/subversion/libsvn_fs_fs/ |
H A D | temp_serializer.c | 1238 mergeinfo_data_t merges; local 1247 merges.count = apr_hash_count(mergeinfo); 1248 merges.keys = apr_palloc(pool, sizeof(*merges.keys) * merges.count); 1249 merges.key_lengths = apr_palloc(pool, sizeof(*merges.key_lengths) * 1250 merges.count); 1251 merges.range_counts = apr_palloc(pool, sizeof(*merges 1324 mergeinfo_data_t *merges = (mergeinfo_data_t *)data; local [all...] |
/freebsd-10-stable/contrib/subversion/subversion/libsvn_fs_x/ |
H A D | temp_serializer.c | 1221 mergeinfo_data_t merges; local 1230 merges.count = apr_hash_count(mergeinfo); 1231 merges.keys = apr_palloc(pool, sizeof(*merges.keys) * merges.count); 1232 merges.key_lengths = apr_palloc(pool, sizeof(*merges.key_lengths) * 1233 merges.count); 1234 merges.range_counts = apr_palloc(pool, sizeof(*merges 1307 mergeinfo_data_t *merges = (mergeinfo_data_t *)data; local [all...] |
/freebsd-10-stable/contrib/subversion/subversion/svnbench/ |
H A D | null-log-cmd.c | 59 /* part that came from merges */ member in struct:log_receiver_baton 60 apr_int64_t merges; 123 lb->merges++; 223 _("%15s revisions, %15s merged in %s merges\n" 228 svn__ui64toa_sep(lb.merges, ',', pool),
|
/freebsd-10-stable/contrib/ofed/management/ |
H A D | gen_chlog.sh | 61 git log --no-merges "${format}" $ver -- $target
|
/freebsd-10-stable/usr.sbin/freebsd-update/ |
H A D | freebsd-update.sh | 2358 : > failed.merges 2389 echo ${F} >> failed.merges 2414 done < failed.merges 2415 rm failed.merges
|
/freebsd-10-stable/contrib/subversion/subversion/libsvn_client/ |
H A D | merge.c | 125 * gets split into sequential merges of the following location pairs. 202 * During mergeinfo unaware merges, CHILDREN_WITH_MERGEINFO contains 206 * During mergeinfo aware merges CHILDREN_WITH_MERGEINFO is created 211 * For clarification on mergeinfo aware vs. mergeinfo unaware merges, see 359 comment) or a similar list for single-file-merges */ 1028 Used for both file and directory property merges. */ 1614 ancestors of operational merges 1700 ancestors of operational merges 1874 future merges into non-shallow working copies to merge 2688 future merges int 5286 update_wc_mergeinfo(svn_mergeinfo_catalog_t result_catalog, const char *target_abspath, const char *source_fspath, apr_hash_t *merges, svn_boolean_t is_rollback, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 5440 apr_hash_t *merges; local 7835 apr_hash_t *merges = apr_hash_make(iterpool); local [all...] |
Completed in 106 milliseconds