Searched refs:text_conflicts (Results 1 - 5 of 5) sorted by relevance
| /freebsd-12-stable/contrib/subversion/subversion/svn/ |
| H A D | status-cmd.c | 72 unsigned int text_conflicts;
93 if (sb->text_conflicts > 0 || sb->prop_conflicts > 0 ||
97 if (sb->text_conflicts > 0)
99 (pool, _(" Text conflicts: %u\n"), sb->text_conflicts));
170 &sb->text_conflicts,
330 sb.text_conflicts = 0;
70 unsigned int text_conflicts; member in struct:status_baton
|
| H A D | notify.c | 73 apr_hash_t *text_conflicts, *prop_conflicts, *tree_conflicts;
85 conflict_stats->text_conflicts = apr_hash_make(pool);
110 if (svn_hash_gets(conflict_stats->text_conflicts, path_local))
112 svn_hash_sets(conflict_stats->text_conflicts, path_local, NULL);
158 int n_text = apr_hash_count(conflict_stats->text_conflicts);
175 SVN_ERR(svn_hash_keys(&k_text, conflict_stats->text_conflicts,
225 int n_text = apr_hash_count(conflict_stats->text_conflicts);
404 store_path(nb, nb->conflict_stats->text_conflicts, path_local);
417 store_path(nb, nb->conflict_stats->text_conflicts, path_local);
533 store_path(nb, nb->conflict_stats->text_conflicts, path_loca
71 apr_hash_t *text_conflicts, *prop_conflicts, *tree_conflicts; member in struct:svn_cl__conflict_stats_t
[all...] |
| H A D | status.c | 224 unsigned int *text_conflicts,
298 (*text_conflicts)++;
584 unsigned int *text_conflicts,
627 text_conflicts, prop_conflicts, tree_conflicts,
215 print_status(const char *target_abspath, const char *target_path, const char *path, svn_boolean_t detailed, svn_boolean_t show_last_committed, svn_boolean_t repos_locks, const svn_client_status_t *status, unsigned int *text_conflicts, unsigned int *prop_conflicts, unsigned int *tree_conflicts, svn_client_ctx_t *ctx, apr_pool_t *pool) argument
573 svn_cl__print_status(const char *target_abspath, const char *target_path, const char *path, const svn_client_status_t *status, svn_boolean_t suppress_externals_placeholders, svn_boolean_t detailed, svn_boolean_t show_last_committed, svn_boolean_t skip_unrecognized, svn_boolean_t repos_locks, unsigned int *text_conflicts, unsigned int *prop_conflicts, unsigned int *tree_conflicts, svn_client_ctx_t *ctx, apr_pool_t *pool) argument
|
| H A D | cl.h | 598 unsigned int *text_conflicts,
|
| /freebsd-12-stable/contrib/subversion/subversion/svnbench/ |
| H A D | notify.c | 59 unsigned int text_conflicts;
198 nb->text_conflicts++;
214 nb->text_conflicts++;
290 nb->text_conflicts++;
498 nb->text_conflicts++;
1028 nb->text_conflicts = 0;
57 unsigned int text_conflicts; member in struct:notify_baton
|
Completed in 158 milliseconds