| /dports/devel/brz/breezy-3.2.0/breezy/bzr/tests/ |
| H A D | test_conflicts.py | 98 tree_conflicts.select_conflicts(tree, paths, **kwargs))
102 tree_conflicts = clist([foo, bar])
105 check_select(clist(), tree_conflicts,
109 tree_conflicts = clist([foobaz, bar])
115 tree_conflicts = clist([qux])
117 check_select(clist(), tree_conflicts,
119 check_select(tree_conflicts, clist(), ['foo'], ignore_misses=True)
|
| /dports/devel/brz/breezy-3.2.0/breezy/plugins/weave_fmt/ |
| H A D | test_workingtree.py | 83 tree_conflicts = tree.conflicts()
84 self.assertLength(2, tree_conflicts)
85 self.assertTrue('hello' in tree_conflicts[0].path)
86 self.assertTrue('hello.sploo' in tree_conflicts[1].path)
|
| /dports/java/java-subversion/subversion-1.14.1/subversion/svn/ |
| H A D | status-cmd.c | 72 unsigned int tree_conflicts; member
92 sb->tree_conflicts > 0) in print_conflict_stats()
103 if (sb->tree_conflicts > 0) in print_conflict_stats()
105 (pool, _(" Tree conflicts: %u\n"), sb->tree_conflicts)); in print_conflict_stats()
170 &sb->tree_conflicts, in print_status_normal_or_xml()
330 sb.tree_conflicts = 0; in svn_cl__status()
|
| H A D | notify.c | 71 apr_hash_t *text_conflicts, *prop_conflicts, *tree_conflicts; member
85 conflict_stats->tree_conflicts = apr_hash_make(pool); in svn_cl__conflict_stats_create()
122 if (svn_hash_gets(conflict_stats->tree_conflicts, path_local)) in svn_cl__conflict_stats_resolved()
124 svn_hash_sets(conflict_stats->tree_conflicts, path_local, NULL); in svn_cl__conflict_stats_resolved()
158 int n_tree = apr_hash_count(conflict_stats->tree_conflicts); in svn_cl__conflict_stats_get_paths()
203 SVN_ERR(svn_hash_keys(&k_tree, conflict_stats->tree_conflicts, in svn_cl__conflict_stats_get_paths()
225 int n_tree = apr_hash_count(conflict_stats->tree_conflicts); in svn_cl__print_conflict_stats()
1095 store_path(nb, nb->conflict_stats->tree_conflicts, path_local); in notify_body()
|
| H A D | status.c | 224 unsigned int *tree_conflicts, in print_status() argument
293 (*tree_conflicts)++; in print_status()
584 unsigned int *tree_conflicts, in svn_cl__print_status() argument
625 text_conflicts, prop_conflicts, tree_conflicts, in svn_cl__print_status()
|
| /dports/devel/py-subversion/subversion-1.14.1/subversion/svn/ |
| H A D | status-cmd.c | 72 unsigned int tree_conflicts; member
92 sb->tree_conflicts > 0) in print_conflict_stats()
103 if (sb->tree_conflicts > 0) in print_conflict_stats()
105 (pool, _(" Tree conflicts: %u\n"), sb->tree_conflicts)); in print_conflict_stats()
170 &sb->tree_conflicts, in print_status_normal_or_xml()
330 sb.tree_conflicts = 0; in svn_cl__status()
|
| H A D | notify.c | 71 apr_hash_t *text_conflicts, *prop_conflicts, *tree_conflicts; member
85 conflict_stats->tree_conflicts = apr_hash_make(pool); in svn_cl__conflict_stats_create()
122 if (svn_hash_gets(conflict_stats->tree_conflicts, path_local)) in svn_cl__conflict_stats_resolved()
124 svn_hash_sets(conflict_stats->tree_conflicts, path_local, NULL); in svn_cl__conflict_stats_resolved()
158 int n_tree = apr_hash_count(conflict_stats->tree_conflicts); in svn_cl__conflict_stats_get_paths()
203 SVN_ERR(svn_hash_keys(&k_tree, conflict_stats->tree_conflicts, in svn_cl__conflict_stats_get_paths()
225 int n_tree = apr_hash_count(conflict_stats->tree_conflicts); in svn_cl__print_conflict_stats()
1095 store_path(nb, nb->conflict_stats->tree_conflicts, path_local); in notify_body()
|
| /dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/svn/ |
| H A D | status-cmd.c | 72 unsigned int tree_conflicts; member
92 sb->tree_conflicts > 0) in print_conflict_stats()
103 if (sb->tree_conflicts > 0) in print_conflict_stats()
105 (pool, _(" Tree conflicts: %u\n"), sb->tree_conflicts)); in print_conflict_stats()
170 &sb->tree_conflicts, in print_status_normal_or_xml()
330 sb.tree_conflicts = 0; in svn_cl__status()
|
| H A D | notify.c | 71 apr_hash_t *text_conflicts, *prop_conflicts, *tree_conflicts; member
85 conflict_stats->tree_conflicts = apr_hash_make(pool); in svn_cl__conflict_stats_create()
122 if (svn_hash_gets(conflict_stats->tree_conflicts, path_local)) in svn_cl__conflict_stats_resolved()
124 svn_hash_sets(conflict_stats->tree_conflicts, path_local, NULL); in svn_cl__conflict_stats_resolved()
158 int n_tree = apr_hash_count(conflict_stats->tree_conflicts); in svn_cl__conflict_stats_get_paths()
203 SVN_ERR(svn_hash_keys(&k_tree, conflict_stats->tree_conflicts, in svn_cl__conflict_stats_get_paths()
225 int n_tree = apr_hash_count(conflict_stats->tree_conflicts); in svn_cl__print_conflict_stats()
1095 store_path(nb, nb->conflict_stats->tree_conflicts, path_local); in notify_body()
|
| /dports/devel/p5-subversion/subversion-1.14.1/subversion/svn/ |
| H A D | status-cmd.c | 72 unsigned int tree_conflicts; member
92 sb->tree_conflicts > 0) in print_conflict_stats()
103 if (sb->tree_conflicts > 0) in print_conflict_stats()
105 (pool, _(" Tree conflicts: %u\n"), sb->tree_conflicts)); in print_conflict_stats()
170 &sb->tree_conflicts, in print_status_normal_or_xml()
330 sb.tree_conflicts = 0; in svn_cl__status()
|
| H A D | notify.c | 71 apr_hash_t *text_conflicts, *prop_conflicts, *tree_conflicts; member
85 conflict_stats->tree_conflicts = apr_hash_make(pool); in svn_cl__conflict_stats_create()
122 if (svn_hash_gets(conflict_stats->tree_conflicts, path_local)) in svn_cl__conflict_stats_resolved()
124 svn_hash_sets(conflict_stats->tree_conflicts, path_local, NULL); in svn_cl__conflict_stats_resolved()
158 int n_tree = apr_hash_count(conflict_stats->tree_conflicts); in svn_cl__conflict_stats_get_paths()
203 SVN_ERR(svn_hash_keys(&k_tree, conflict_stats->tree_conflicts, in svn_cl__conflict_stats_get_paths()
225 int n_tree = apr_hash_count(conflict_stats->tree_conflicts); in svn_cl__print_conflict_stats()
1095 store_path(nb, nb->conflict_stats->tree_conflicts, path_local); in notify_body()
|
| /dports/devel/brz/breezy-3.2.0/breezy/ |
| H A D | conflicts.py | 177 tree_conflicts = tree.conflicts()
178 nb_conflicts_before = len(tree_conflicts)
181 to_process = tree_conflicts
183 new_conflicts, to_process = tree_conflicts.select_conflicts(
|
| /dports/java/java-subversion/subversion-1.14.1/subversion/libsvn_wc/ |
| H A D | info.c | 351 apr_hash_t *tree_conflicts; member
405 svn_hash_sets(fe_baton->tree_conflicts, in info_found_node_callback()
415 svn_hash_sets(fe_baton->tree_conflicts, local_abspath, NULL); in info_found_node_callback()
465 fe_baton.tree_conflicts = apr_hash_make(scratch_pool); in svn_wc__get_info()
500 svn_hash_sets(fe_baton.tree_conflicts, local_abspath, ""); in svn_wc__get_info()
507 for (hi = apr_hash_first(scratch_pool, fe_baton.tree_conflicts); hi; in svn_wc__get_info()
|
| H A D | entries.c | 466 apr_hash_t *tree_conflicts = NULL; in read_one_entry() local
500 if (!tree_conflicts) in read_one_entry()
507 if (tree_conflicts) in read_one_entry()
1690 apr_hash_t *tree_conflicts; member
1728 apr_hash_t *tree_conflicts; in write_entry() local
2014 tree_conflicts = apr_hash_make(result_pool); in write_entry()
2045 tree_conflicts = NULL; in write_entry()
2047 if (parent_node && parent_node->tree_conflicts) in write_entry()
2447 (*entry_node)->tree_conflicts = tree_conflicts; in write_entry()
2464 write_actual_only_entries(apr_hash_t *tree_conflicts, in write_actual_only_entries() argument
[all …]
|
| /dports/devel/py-subversion/subversion-1.14.1/subversion/libsvn_wc/ |
| H A D | info.c | 351 apr_hash_t *tree_conflicts; member
405 svn_hash_sets(fe_baton->tree_conflicts, in info_found_node_callback()
415 svn_hash_sets(fe_baton->tree_conflicts, local_abspath, NULL); in info_found_node_callback()
465 fe_baton.tree_conflicts = apr_hash_make(scratch_pool); in svn_wc__get_info()
500 svn_hash_sets(fe_baton.tree_conflicts, local_abspath, ""); in svn_wc__get_info()
507 for (hi = apr_hash_first(scratch_pool, fe_baton.tree_conflicts); hi; in svn_wc__get_info()
|
| H A D | entries.c | 466 apr_hash_t *tree_conflicts = NULL; in read_one_entry() local
500 if (!tree_conflicts) in read_one_entry()
507 if (tree_conflicts) in read_one_entry()
1690 apr_hash_t *tree_conflicts; member
1728 apr_hash_t *tree_conflicts; in write_entry() local
2014 tree_conflicts = apr_hash_make(result_pool); in write_entry()
2045 tree_conflicts = NULL; in write_entry()
2047 if (parent_node && parent_node->tree_conflicts) in write_entry()
2447 (*entry_node)->tree_conflicts = tree_conflicts; in write_entry()
2464 write_actual_only_entries(apr_hash_t *tree_conflicts, in write_actual_only_entries() argument
[all …]
|
| /dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/libsvn_wc/ |
| H A D | info.c | 351 apr_hash_t *tree_conflicts; member
405 svn_hash_sets(fe_baton->tree_conflicts, in info_found_node_callback()
415 svn_hash_sets(fe_baton->tree_conflicts, local_abspath, NULL); in info_found_node_callback()
465 fe_baton.tree_conflicts = apr_hash_make(scratch_pool); in svn_wc__get_info()
500 svn_hash_sets(fe_baton.tree_conflicts, local_abspath, ""); in svn_wc__get_info()
507 for (hi = apr_hash_first(scratch_pool, fe_baton.tree_conflicts); hi; in svn_wc__get_info()
|
| H A D | entries.c | 466 apr_hash_t *tree_conflicts = NULL; in read_one_entry() local
500 if (!tree_conflicts) in read_one_entry()
507 if (tree_conflicts) in read_one_entry()
1690 apr_hash_t *tree_conflicts; member
1728 apr_hash_t *tree_conflicts; in write_entry() local
2014 tree_conflicts = apr_hash_make(result_pool); in write_entry()
2045 tree_conflicts = NULL; in write_entry()
2047 if (parent_node && parent_node->tree_conflicts) in write_entry()
2447 (*entry_node)->tree_conflicts = tree_conflicts; in write_entry()
2464 write_actual_only_entries(apr_hash_t *tree_conflicts, in write_actual_only_entries() argument
[all …]
|
| /dports/devel/p5-subversion/subversion-1.14.1/subversion/libsvn_wc/ |
| H A D | info.c | 351 apr_hash_t *tree_conflicts; member
405 svn_hash_sets(fe_baton->tree_conflicts, in info_found_node_callback()
415 svn_hash_sets(fe_baton->tree_conflicts, local_abspath, NULL); in info_found_node_callback()
465 fe_baton.tree_conflicts = apr_hash_make(scratch_pool); in svn_wc__get_info()
500 svn_hash_sets(fe_baton.tree_conflicts, local_abspath, ""); in svn_wc__get_info()
507 for (hi = apr_hash_first(scratch_pool, fe_baton.tree_conflicts); hi; in svn_wc__get_info()
|
| H A D | entries.c | 466 apr_hash_t *tree_conflicts = NULL; in read_one_entry() local
500 if (!tree_conflicts) in read_one_entry()
507 if (tree_conflicts) in read_one_entry()
1690 apr_hash_t *tree_conflicts; member
1728 apr_hash_t *tree_conflicts; in write_entry() local
2014 tree_conflicts = apr_hash_make(result_pool); in write_entry()
2045 tree_conflicts = NULL; in write_entry()
2047 if (parent_node && parent_node->tree_conflicts) in write_entry()
2447 (*entry_node)->tree_conflicts = tree_conflicts; in write_entry()
2464 write_actual_only_entries(apr_hash_t *tree_conflicts, in write_actual_only_entries() argument
[all …]
|
| /dports/java/java-subversion/subversion-1.14.1/subversion/tests/cmdline/svntest/ |
| H A D | mergetrees.py | 50 text_conflicts=0, prop_conflicts=0, tree_conflicts=0, argument
112 text_conflicts, prop_conflicts, tree_conflicts,
384 text_conflicts=0, prop_conflicts=0, tree_conflicts=0, argument
423 tree_conflicts=tree_conflicts,
|
| /dports/devel/py-subversion/subversion-1.14.1/subversion/tests/cmdline/svntest/ |
| H A D | mergetrees.py | 50 text_conflicts=0, prop_conflicts=0, tree_conflicts=0, argument
112 text_conflicts, prop_conflicts, tree_conflicts,
384 text_conflicts=0, prop_conflicts=0, tree_conflicts=0, argument
423 tree_conflicts=tree_conflicts,
|
| /dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/tests/cmdline/svntest/ |
| H A D | mergetrees.py | 50 text_conflicts=0, prop_conflicts=0, tree_conflicts=0, argument
112 text_conflicts, prop_conflicts, tree_conflicts,
384 text_conflicts=0, prop_conflicts=0, tree_conflicts=0, argument
423 tree_conflicts=tree_conflicts,
|
| /dports/devel/p5-subversion/subversion-1.14.1/subversion/tests/cmdline/svntest/ |
| H A D | mergetrees.py | 50 text_conflicts=0, prop_conflicts=0, tree_conflicts=0, argument
112 text_conflicts, prop_conflicts, tree_conflicts,
384 text_conflicts=0, prop_conflicts=0, tree_conflicts=0, argument
423 tree_conflicts=tree_conflicts,
|
| /dports/devel/brz/breezy-3.2.0/breezy/tests/ |
| H A D | test_conflicts.py | 90 tree_conflicts.select_conflicts(tree, paths, **kwargs))
94 tree_conflicts = clist([foo, bar])
97 check_select(clist(), tree_conflicts,
101 tree_conflicts = clist([foobaz, bar])
107 tree_conflicts = clist([qux])
109 check_select(tree_conflicts, clist(),
111 check_select(tree_conflicts, clist(), ['foo'], ignore_misses=True)
|