| /dports/java/java-subversion/subversion-1.14.1/subversion/libsvn_client/ |
| H A D | commit.c | 277 const char *base_abspath, in determine_lock_targets() argument
427 const char *base_abspath, in append_externals_as_explicit_targets() argument
462 target = svn_dirent_join(base_abspath, in append_externals_as_explicit_targets()
567 const char *base_abspath; in svn_client__wc_replay() local
581 if (base_abspath == NULL) in svn_client__wc_replay()
595 base_abspath, rel_targets, in svn_client__wc_replay()
646 const char *base_abspath; in svn_client_commit6() local
685 if (base_abspath == NULL) in svn_client_commit6()
737 base_abspath, in svn_client_commit6()
744 base_abspath, in svn_client_commit6()
[all …]
|
| /dports/devel/py-subversion/subversion-1.14.1/subversion/libsvn_client/ |
| H A D | commit.c | 277 const char *base_abspath, in determine_lock_targets() argument
427 const char *base_abspath, in append_externals_as_explicit_targets() argument
462 target = svn_dirent_join(base_abspath, in append_externals_as_explicit_targets()
567 const char *base_abspath; in svn_client__wc_replay() local
581 if (base_abspath == NULL) in svn_client__wc_replay()
595 base_abspath, rel_targets, in svn_client__wc_replay()
646 const char *base_abspath; in svn_client_commit6() local
685 if (base_abspath == NULL) in svn_client_commit6()
737 base_abspath, in svn_client_commit6()
744 base_abspath, in svn_client_commit6()
[all …]
|
| /dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/libsvn_client/ |
| H A D | commit.c | 277 const char *base_abspath, in determine_lock_targets() argument
427 const char *base_abspath, in append_externals_as_explicit_targets() argument
462 target = svn_dirent_join(base_abspath, in append_externals_as_explicit_targets()
567 const char *base_abspath; in svn_client__wc_replay() local
581 if (base_abspath == NULL) in svn_client__wc_replay()
595 base_abspath, rel_targets, in svn_client__wc_replay()
646 const char *base_abspath; in svn_client_commit6() local
685 if (base_abspath == NULL) in svn_client_commit6()
737 base_abspath, in svn_client_commit6()
744 base_abspath, in svn_client_commit6()
[all …]
|
| /dports/devel/p5-subversion/subversion-1.14.1/subversion/libsvn_client/ |
| H A D | commit.c | 277 const char *base_abspath, in determine_lock_targets() argument
427 const char *base_abspath, in append_externals_as_explicit_targets() argument
462 target = svn_dirent_join(base_abspath, in append_externals_as_explicit_targets()
567 const char *base_abspath; in svn_client__wc_replay() local
581 if (base_abspath == NULL) in svn_client__wc_replay()
595 base_abspath, rel_targets, in svn_client__wc_replay()
646 const char *base_abspath; in svn_client_commit6() local
685 if (base_abspath == NULL) in svn_client_commit6()
737 base_abspath, in svn_client_commit6()
744 base_abspath, in svn_client_commit6()
[all …]
|
| /dports/java/java-subversion/subversion-1.14.1/subversion/libsvn_wc/ |
| H A D | util.c | 294 if (conflict->base_abspath) in svn_wc_conflict_description2_dup()
295 new_conflict->base_abspath = apr_pstrdup(pool, conflict->base_abspath); in svn_wc_conflict_description2_dup()
394 if (conflict->base_abspath) in svn_wc__cd2_to_cd()
396 conflict->base_abspath); in svn_wc__cd2_to_cd()
428 const char *local_abspath = svn_dirent_join(sfb->base_abspath, path, in svn_wc__fetch_kind_func()
450 const char *local_abspath = svn_dirent_join(sfb->base_abspath, path, in svn_wc__fetch_props_func()
485 const char *local_abspath = svn_dirent_join(sfb->base_abspath, path, in svn_wc__fetch_base_func()
|
| /dports/devel/py-subversion/subversion-1.14.1/subversion/libsvn_wc/ |
| H A D | util.c | 294 if (conflict->base_abspath) in svn_wc_conflict_description2_dup()
295 new_conflict->base_abspath = apr_pstrdup(pool, conflict->base_abspath); in svn_wc_conflict_description2_dup()
394 if (conflict->base_abspath) in svn_wc__cd2_to_cd()
396 conflict->base_abspath); in svn_wc__cd2_to_cd()
428 const char *local_abspath = svn_dirent_join(sfb->base_abspath, path, in svn_wc__fetch_kind_func()
450 const char *local_abspath = svn_dirent_join(sfb->base_abspath, path, in svn_wc__fetch_props_func()
485 const char *local_abspath = svn_dirent_join(sfb->base_abspath, path, in svn_wc__fetch_base_func()
|
| /dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/libsvn_wc/ |
| H A D | util.c | 294 if (conflict->base_abspath) in svn_wc_conflict_description2_dup()
295 new_conflict->base_abspath = apr_pstrdup(pool, conflict->base_abspath); in svn_wc_conflict_description2_dup()
394 if (conflict->base_abspath) in svn_wc__cd2_to_cd()
396 conflict->base_abspath); in svn_wc__cd2_to_cd()
428 const char *local_abspath = svn_dirent_join(sfb->base_abspath, path, in svn_wc__fetch_kind_func()
450 const char *local_abspath = svn_dirent_join(sfb->base_abspath, path, in svn_wc__fetch_props_func()
485 const char *local_abspath = svn_dirent_join(sfb->base_abspath, path, in svn_wc__fetch_base_func()
|
| /dports/devel/p5-subversion/subversion-1.14.1/subversion/libsvn_wc/ |
| H A D | util.c | 294 if (conflict->base_abspath) in svn_wc_conflict_description2_dup()
295 new_conflict->base_abspath = apr_pstrdup(pool, conflict->base_abspath); in svn_wc_conflict_description2_dup()
394 if (conflict->base_abspath) in svn_wc__cd2_to_cd()
396 conflict->base_abspath); in svn_wc__cd2_to_cd()
428 const char *local_abspath = svn_dirent_join(sfb->base_abspath, path, in svn_wc__fetch_kind_func()
450 const char *local_abspath = svn_dirent_join(sfb->base_abspath, path, in svn_wc__fetch_props_func()
485 const char *local_abspath = svn_dirent_join(sfb->base_abspath, path, in svn_wc__fetch_base_func()
|
| /dports/java/java-subversion/subversion-1.14.1/subversion/svn/ |
| H A D | conflict-callbacks.c | 182 const char *base_abspath; in show_conflicts() local
197 output, diff, base_abspath, my_abspath, their_abspath, in show_conflicts()
898 const char *base_abspath; in handle_text_conflict() local
939 ((merged_abspath && base_abspath) in handle_text_conflict()
940 || (!base_abspath && my_abspath && their_abspath))) in handle_text_conflict()
1013 else if (! (my_abspath && base_abspath && their_abspath)) in handle_text_conflict()
1063 err = svn_cl__merge_file_externally(base_abspath, in handle_text_conflict()
1078 base_abspath, in handle_text_conflict()
1127 err = svn_cl__merge_file_externally(base_abspath, in handle_text_conflict()
1158 base_abspath, in handle_text_conflict()
[all …]
|
| H A D | cl-conflicts.c | 514 const char *base_abspath; in svn_cl__append_conflict_info_xml() local
541 &base_abspath, in svn_cl__append_conflict_info_xml()
547 &str, scratch_pool, "prev-base-file", base_abspath); in svn_cl__append_conflict_info_xml()
|
| H A D | info-cmd.c | 906 const char *base_abspath = NULL; in print_info() local
911 NULL, &my_abspath, &base_abspath, &their_abspath, in print_info()
914 if (base_abspath) in print_info()
919 base_abspath, in print_info()
|
| /dports/devel/py-subversion/subversion-1.14.1/subversion/svn/ |
| H A D | conflict-callbacks.c | 182 const char *base_abspath; in show_conflicts() local
197 output, diff, base_abspath, my_abspath, their_abspath, in show_conflicts()
898 const char *base_abspath; in handle_text_conflict() local
939 ((merged_abspath && base_abspath) in handle_text_conflict()
940 || (!base_abspath && my_abspath && their_abspath))) in handle_text_conflict()
1013 else if (! (my_abspath && base_abspath && their_abspath)) in handle_text_conflict()
1063 err = svn_cl__merge_file_externally(base_abspath, in handle_text_conflict()
1078 base_abspath, in handle_text_conflict()
1127 err = svn_cl__merge_file_externally(base_abspath, in handle_text_conflict()
1158 base_abspath, in handle_text_conflict()
[all …]
|
| H A D | cl-conflicts.c | 514 const char *base_abspath; in svn_cl__append_conflict_info_xml() local
541 &base_abspath, in svn_cl__append_conflict_info_xml()
547 &str, scratch_pool, "prev-base-file", base_abspath); in svn_cl__append_conflict_info_xml()
|
| H A D | info-cmd.c | 906 const char *base_abspath = NULL; in print_info() local
911 NULL, &my_abspath, &base_abspath, &their_abspath, in print_info()
914 if (base_abspath) in print_info()
919 base_abspath, in print_info()
|
| /dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/svn/ |
| H A D | conflict-callbacks.c | 182 const char *base_abspath; in show_conflicts() local
197 output, diff, base_abspath, my_abspath, their_abspath, in show_conflicts()
898 const char *base_abspath; in handle_text_conflict() local
939 ((merged_abspath && base_abspath) in handle_text_conflict()
940 || (!base_abspath && my_abspath && their_abspath))) in handle_text_conflict()
1013 else if (! (my_abspath && base_abspath && their_abspath)) in handle_text_conflict()
1063 err = svn_cl__merge_file_externally(base_abspath, in handle_text_conflict()
1078 base_abspath, in handle_text_conflict()
1127 err = svn_cl__merge_file_externally(base_abspath, in handle_text_conflict()
1158 base_abspath, in handle_text_conflict()
[all …]
|
| H A D | cl-conflicts.c | 514 const char *base_abspath; in svn_cl__append_conflict_info_xml() local
541 &base_abspath, in svn_cl__append_conflict_info_xml()
547 &str, scratch_pool, "prev-base-file", base_abspath); in svn_cl__append_conflict_info_xml()
|
| H A D | info-cmd.c | 906 const char *base_abspath = NULL; in print_info() local
911 NULL, &my_abspath, &base_abspath, &their_abspath, in print_info()
914 if (base_abspath) in print_info()
919 base_abspath, in print_info()
|
| /dports/devel/p5-subversion/subversion-1.14.1/subversion/svn/ |
| H A D | conflict-callbacks.c | 182 const char *base_abspath; in show_conflicts() local
197 output, diff, base_abspath, my_abspath, their_abspath, in show_conflicts()
898 const char *base_abspath; in handle_text_conflict() local
939 ((merged_abspath && base_abspath) in handle_text_conflict()
940 || (!base_abspath && my_abspath && their_abspath))) in handle_text_conflict()
1013 else if (! (my_abspath && base_abspath && their_abspath)) in handle_text_conflict()
1063 err = svn_cl__merge_file_externally(base_abspath, in handle_text_conflict()
1078 base_abspath, in handle_text_conflict()
1127 err = svn_cl__merge_file_externally(base_abspath, in handle_text_conflict()
1158 base_abspath, in handle_text_conflict()
[all …]
|
| H A D | cl-conflicts.c | 514 const char *base_abspath; in svn_cl__append_conflict_info_xml() local
541 &base_abspath, in svn_cl__append_conflict_info_xml()
547 &str, scratch_pool, "prev-base-file", base_abspath); in svn_cl__append_conflict_info_xml()
|
| H A D | info-cmd.c | 906 const char *base_abspath = NULL; in print_info() local
911 NULL, &my_abspath, &base_abspath, &their_abspath, in print_info()
914 if (base_abspath) in print_info()
919 base_abspath, in print_info()
|
| /dports/devel/kdesvn/kdesvn-2.1.0/src/svnqt/ |
| H A D | conflictdescription.cpp | 43 m_baseFile = QString::fromUtf8(conflict->base_abspath); in ConflictDescription()
|
| /dports/java/java-subversion/subversion-1.14.1/subversion/tests/libsvn_wc/ |
| H A D | conflict-data-test.c | 107 ASSERT_STR_EQ(actual->base_abspath, expected->base_abspath); in compare_conflict()
166 SVN_ERR(compare_file_content(actual->base_abspath, expected_base_val, in compare_prop_conflict()
|
| /dports/devel/py-subversion/subversion-1.14.1/subversion/tests/libsvn_wc/ |
| H A D | conflict-data-test.c | 107 ASSERT_STR_EQ(actual->base_abspath, expected->base_abspath); in compare_conflict()
166 SVN_ERR(compare_file_content(actual->base_abspath, expected_base_val, in compare_prop_conflict()
|
| /dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/tests/libsvn_wc/ |
| H A D | conflict-data-test.c | 107 ASSERT_STR_EQ(actual->base_abspath, expected->base_abspath); in compare_conflict()
166 SVN_ERR(compare_file_content(actual->base_abspath, expected_base_val, in compare_prop_conflict()
|
| /dports/devel/p5-subversion/subversion-1.14.1/subversion/tests/libsvn_wc/ |
| H A D | conflict-data-test.c | 107 ASSERT_STR_EQ(actual->base_abspath, expected->base_abspath); in compare_conflict()
166 SVN_ERR(compare_file_content(actual->base_abspath, expected_base_val, in compare_prop_conflict()
|