Author: rinrab
Date: Sun Nov 24 17:12:31 2024
New Revision: 1922051
URL: http://svn.apache.org/viewvc?rev=1922051&view=rev
Log:
On the 'apply-processor' branch: Merge few minor changes from trunk@1922050.
Modified:
subversion/branches/apply-processor/ (props changed)
subversion/branches/apply-processor/subversion/libsvn_client/merge.c
subversion/branches/apply-processor/subversion/libsvn_client/util.c
Propchange: subversion/branches/apply-processor/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1922042-1922050
Modified: subversion/branches/apply-processor/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/branches/apply-processor/subversion/libsvn_client/merge.c?rev=1922051&r1=1922050&r2=1922051&view=diff
==============================================================================
--- subversion/branches/apply-processor/subversion/libsvn_client/merge.c
(original)
+++ subversion/branches/apply-processor/subversion/libsvn_client/merge.c Sun
Nov 24 17:12:31 2024
@@ -384,35 +384,6 @@ session_url_is(svn_ra_session_t *ra_sess
return strcmp(url, session_url) == 0;
}
-/* Return a new merge_source_t structure, allocated in RESULT_POOL,
- * initialized with deep copies of LOC1 and LOC2 and ANCESTRAL. */
-svn_client__merge_source_t *
-svn_client__merge_source_create(const svn_client__pathrev_t *loc1,
- const svn_client__pathrev_t *loc2,
- svn_boolean_t ancestral,
- apr_pool_t *result_pool)
-{
- svn_client__merge_source_t *s
- = apr_palloc(result_pool, sizeof(*s));
-
- s->loc1 = svn_client__pathrev_dup(loc1, result_pool);
- s->loc2 = svn_client__pathrev_dup(loc2, result_pool);
- s->ancestral = ancestral;
- return s;
-}
-
-/* Return a deep copy of SOURCE, allocated in RESULT_POOL. */
-svn_client__merge_source_t *
-svn_client__merge_source_dup(const svn_client__merge_source_t *source,
- apr_pool_t *result_pool)
-{
- svn_client__merge_source_t *s = apr_palloc(result_pool, sizeof(*s));
-
- s->loc1 = svn_client__pathrev_dup(source->loc1, result_pool);
- s->loc2 = svn_client__pathrev_dup(source->loc2, result_pool);
- s->ancestral = source->ancestral;
- return s;
-}
/* Decide whether ambiguous foreign merge should be a warning or an error */
#define WITH_AMBIGUOUS_FOREIGN_MERGE_WARNING \
Modified: subversion/branches/apply-processor/subversion/libsvn_client/util.c
URL:
http://svn.apache.org/viewvc/subversion/branches/apply-processor/subversion/libsvn_client/util.c?rev=1922051&r1=1922050&r2=1922051&view=diff
==============================================================================
--- subversion/branches/apply-processor/subversion/libsvn_client/util.c
(original)
+++ subversion/branches/apply-processor/subversion/libsvn_client/util.c Sun Nov
24 17:12:31 2024
@@ -136,6 +136,34 @@ svn_client__pathrev_fspath(const svn_cli
}
+svn_client__merge_source_t *
+svn_client__merge_source_create(const svn_client__pathrev_t *loc1,
+ const svn_client__pathrev_t *loc2,
+ svn_boolean_t ancestral,
+ apr_pool_t *result_pool)
+{
+ svn_client__merge_source_t *s
+ = apr_palloc(result_pool, sizeof(*s));
+
+ s->loc1 = svn_client__pathrev_dup(loc1, result_pool);
+ s->loc2 = svn_client__pathrev_dup(loc2, result_pool);
+ s->ancestral = ancestral;
+ return s;
+}
+
+svn_client__merge_source_t *
+svn_client__merge_source_dup(const svn_client__merge_source_t *source,
+ apr_pool_t *result_pool)
+{
+ svn_client__merge_source_t *s = apr_palloc(result_pool, sizeof(*s));
+
+ s->loc1 = svn_client__pathrev_dup(source->loc1, result_pool);
+ s->loc2 = svn_client__pathrev_dup(source->loc2, result_pool);
+ s->ancestral = source->ancestral;
+ return s;
+}
+
+
svn_client_commit_item3_t *
svn_client_commit_item3_create(apr_pool_t *pool)
{
