974 lines
61 KiB
HTML
974 lines
61 KiB
HTML
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
|
|
<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
|
|
<title>Subversion: Merge changes between branches.</title>
|
|
<link href="doxygen.css" rel="stylesheet" type="text/css">
|
|
<link href="tabs.css" rel="stylesheet" type="text/css">
|
|
</head><body>
|
|
<!-- Generated by Doxygen 1.5.6 -->
|
|
<div class="navigation" id="top">
|
|
<div class="tabs">
|
|
<ul>
|
|
<li><a href="index.html"><span>Main Page</span></a></li>
|
|
<li><a href="pages.html"><span>Related Pages</span></a></li>
|
|
<li><a href="modules.html"><span>Modules</span></a></li>
|
|
<li><a href="annotated.html"><span>Data Structures</span></a></li>
|
|
<li><a href="files.html"><span>Files</span></a></li>
|
|
<li>
|
|
<form action="search.php" method="get">
|
|
<table cellspacing="0" cellpadding="0" border="0">
|
|
<tr>
|
|
<td><label> <u>S</u>earch for </label></td>
|
|
<td><input type="text" name="query" value="" size="20" accesskey="s"/></td>
|
|
</tr>
|
|
</table>
|
|
</form>
|
|
</li>
|
|
</ul>
|
|
</div>
|
|
</div>
|
|
<div class="contents">
|
|
<h1>Merge changes between branches.<br>
|
|
<small>
|
|
[<a class="el" href="group__clnt__wc.html">Client working copy management</a>]</small>
|
|
</h1><table border="0" cellpadding="0" cellspacing="0">
|
|
<tr><td></td></tr>
|
|
<tr><td colspan="2"><br><h2>Functions</h2></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structsvn__error__t.html">svn_error_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group__Merge.html#g5acd0a13c8c9d608ff1fd5df1f2e30f1">svn_client_merge3</a> (const char *source1, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *revision1, const char *source2, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *revision2, const char *target_wcpath, <a class="el" href="svn__types_8h.html#21dd8b080111fa6fb5d59156299f3a2c">svn_depth_t</a> depth, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> ignore_ancestry, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> force, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> record_only, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> dry_run, const apr_array_header_t *merge_options, <a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> *ctx, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Merge changes from <em>source1/<em>revision1</em> to</em> <em>source2/<em>revision2</em> into</em> the working-copy path <em>target_wcpath</em>. <a href="#g5acd0a13c8c9d608ff1fd5df1f2e30f1"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structsvn__error__t.html">svn_error_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group__Merge.html#gc4e8f005eb32546d489f412a21361c9a">svn_client_merge2</a> (const char *source1, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *revision1, const char *source2, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *revision2, const char *target_wcpath, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> recurse, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> ignore_ancestry, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> force, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> dry_run, const apr_array_header_t *merge_options, <a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> *ctx, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Similar to <a class="el" href="group__Merge.html#g5acd0a13c8c9d608ff1fd5df1f2e30f1" title="Merge changes from source1/revision1 to source2/revision2 into the working-copy path...">svn_client_merge3()</a>, but with <em>record_only</em> set to <code>FALSE</code>, and <em>depth</em> set according to <em>recurse:</em> if <em>recurse</em> is TRUE, set <em>depth</em> to <code>svn_depth_infinity</code>, if <em>recurse</em> is FALSE, set <em>depth</em> to <code>svn_depth_files</code>. <a href="#gc4e8f005eb32546d489f412a21361c9a"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structsvn__error__t.html">svn_error_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group__Merge.html#gbe2333311fbf2f4a76dcb5d043d13a1f">svn_client_merge</a> (const char *source1, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *revision1, const char *source2, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *revision2, const char *target_wcpath, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> recurse, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> ignore_ancestry, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> force, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> dry_run, <a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> *ctx, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Similar to <a class="el" href="group__Merge.html#gc4e8f005eb32546d489f412a21361c9a" title="Similar to svn_client_merge3(), but with record_only set to FALSE, and depth set...">svn_client_merge2()</a>, but with <em>merge_options</em> set to NULL. <a href="#gbe2333311fbf2f4a76dcb5d043d13a1f"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structsvn__error__t.html">svn_error_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group__Merge.html#gc8791af39c490be7eff250929a68fb41">svn_client_merge_reintegrate</a> (const char *source, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *peg_revision, const char *target_wcpath, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> dry_run, const apr_array_header_t *merge_options, <a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> *ctx, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Perform a reintegration merge of <em>source</em> at <em>peg_revision</em> into . <a href="#gc8791af39c490be7eff250929a68fb41"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structsvn__error__t.html">svn_error_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group__Merge.html#g12005bd5f73bafa3ee56349ec7cf3716">svn_client_merge_peg3</a> (const char *source, const apr_array_header_t *ranges_to_merge, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *peg_revision, const char *target_wcpath, <a class="el" href="svn__types_8h.html#21dd8b080111fa6fb5d59156299f3a2c">svn_depth_t</a> depth, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> ignore_ancestry, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> force, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> record_only, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> dry_run, const apr_array_header_t *merge_options, <a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> *ctx, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Merge the changes between the filesystem object <em>source</em> in peg revision <em>peg_revision</em>, as it changed between the ranges described in <em>ranges_to_merge</em>. <a href="#g12005bd5f73bafa3ee56349ec7cf3716"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structsvn__error__t.html">svn_error_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group__Merge.html#gdbb47dae0b3e6e0ae27aad5509840f04">svn_client_merge_peg2</a> (const char *source, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *revision1, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *revision2, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *peg_revision, const char *target_wcpath, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> recurse, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> ignore_ancestry, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> force, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> dry_run, const apr_array_header_t *merge_options, <a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> *ctx, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Similar to <a class="el" href="group__Merge.html#g12005bd5f73bafa3ee56349ec7cf3716" title="Merge the changes between the filesystem object source in peg revision peg_revision...">svn_client_merge_peg3()</a>, but with <em>record_only</em> set to <code>FALSE</code>, and <em>depth</em> set according to <em>recurse:</em> if <em>recurse</em> is TRUE, set <em>depth</em> to <code>svn_depth_infinity</code>, if <em>recurse</em> is FALSE, set <em>depth</em> to <code>svn_depth_files</code>. <a href="#gdbb47dae0b3e6e0ae27aad5509840f04"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structsvn__error__t.html">svn_error_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group__Merge.html#gb3b7ffa4842894088a311d69bf4f39b8">svn_client_merge_peg</a> (const char *source, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *revision1, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *revision2, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *peg_revision, const char *target_wcpath, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> recurse, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> ignore_ancestry, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> force, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> dry_run, <a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> *ctx, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Similar to <a class="el" href="group__Merge.html#gdbb47dae0b3e6e0ae27aad5509840f04" title="Similar to svn_client_merge_peg3(), but with record_only set to FALSE, and depth...">svn_client_merge_peg2()</a>, but with <em>merge_options</em> set to NULL. <a href="#gb3b7ffa4842894088a311d69bf4f39b8"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structsvn__error__t.html">svn_error_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group__Merge.html#g05713f5c424fd4a2f20a09447075b048">svn_client_suggest_merge_sources</a> (apr_array_header_t **suggestions, const char *path_or_url, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *peg_revision, <a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> *ctx, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Set <em>suggestions</em> to an ordered array of <code>const</code> char * potential merge sources (expressed as full repository URLs) for <em>path_or_url</em> at <em>peg_revision</em>. <a href="#g05713f5c424fd4a2f20a09447075b048"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structsvn__error__t.html">svn_error_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group__Merge.html#gc53de23a6617aeba3a30844171fa3439">svn_client_mergeinfo_get_merged</a> (apr_hash_t **mergeinfo, const char *path_or_url, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *peg_revision, <a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> *ctx, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Set <em>*mergeinfo</em> to a hash mapping <code>const char *</code> merge source URLs to <code>apr_array_header_t *</code> rangelists (arrays of <code><a class="el" href="structsvn__merge__range__t.html" title="Mergeinfo representing a merge of a range of revisions.">svn_merge_range_t</a> *</code> ranges) describing the ranges which have been merged into <em>path_or_url</em> as of <em>peg_revision</em>, or <code>NULL</code> if there is no mergeinfo. <a href="#gc53de23a6617aeba3a30844171fa3439"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structsvn__error__t.html">svn_error_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group__Merge.html#g5490a793f43eaaa306d645d5b1b3bdaa">svn_client_mergeinfo_log_merged</a> (const char *path_or_url, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *peg_revision, const char *merge_source_path_or_url, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *src_peg_revision, <a class="el" href="svn__types_8h.html#fb30054d6301afbcd8b00d8dc11d7ddb">svn_log_entry_receiver_t</a> receiver, void *receiver_baton, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> discover_changed_paths, const apr_array_header_t *revprops, <a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> *ctx, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Drive log entry callbacks <em>receiver</em> / <em>receiver_baton</em> with the revisions merged from <em>merge_source_path_or_url</em> (as of <em>src_peg_revision</em>) into <em>path_or_url</em> (as of <em>peg_revision</em>). <a href="#g5490a793f43eaaa306d645d5b1b3bdaa"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structsvn__error__t.html">svn_error_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="group__Merge.html#g1ebab9ce5d36348a5765b594bdaa73cd">svn_client_mergeinfo_log_eligible</a> (const char *path_or_url, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *peg_revision, const char *merge_source_path_or_url, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *src_peg_revision, <a class="el" href="svn__types_8h.html#fb30054d6301afbcd8b00d8dc11d7ddb">svn_log_entry_receiver_t</a> receiver, void *receiver_baton, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> discover_changed_paths, const apr_array_header_t *revprops, <a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> *ctx, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Drive log entry callbacks <em>receiver</em> / <em>receiver_baton</em> with the revisions eligible for merge from <em>merge_source_path_or_url</em> (as of <em>src_peg_revision</em>) into <em>path_or_url</em> (as of <em>peg_revision</em>). <a href="#g1ebab9ce5d36348a5765b594bdaa73cd"></a><br></td></tr>
|
|
</table>
|
|
<hr><h2>Function Documentation</h2>
|
|
<a class="anchor" name="gbe2333311fbf2f4a76dcb5d043d13a1f"></a><!-- doxytag: member="svn_client.h::svn_client_merge" ref="gbe2333311fbf2f4a76dcb5d043d13a1f" args="(const char *source1, const svn_opt_revision_t *revision1, const char *source2, const svn_opt_revision_t *revision2, const char *target_wcpath, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t force, svn_boolean_t dry_run, svn_client_ctx_t *ctx, apr_pool_t *pool)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="structsvn__error__t.html">svn_error_t</a>* svn_client_merge </td>
|
|
<td>(</td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>source1</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>revision1</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>source2</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>revision2</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>target_wcpath</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>recurse</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>ignore_ancestry</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>force</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>dry_run</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> * </td>
|
|
<td class="paramname"> <em>ctx</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_pool_t * </td>
|
|
<td class="paramname"> <em>pool</em></td><td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>)</td>
|
|
<td></td><td></td><td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
Similar to <a class="el" href="group__Merge.html#gc4e8f005eb32546d489f412a21361c9a" title="Similar to svn_client_merge3(), but with record_only set to FALSE, and depth set...">svn_client_merge2()</a>, but with <em>merge_options</em> set to NULL.
|
|
<p>
|
|
<dl compact><dt><b><a class="el" href="deprecated.html#_deprecated000056">Deprecated:</a></b></dt><dd>Provided for backwards compatibility with the 1.3 API. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="gc4e8f005eb32546d489f412a21361c9a"></a><!-- doxytag: member="svn_client.h::svn_client_merge2" ref="gc4e8f005eb32546d489f412a21361c9a" args="(const char *source1, const svn_opt_revision_t *revision1, const char *source2, const svn_opt_revision_t *revision2, const char *target_wcpath, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t force, svn_boolean_t dry_run, const apr_array_header_t *merge_options, svn_client_ctx_t *ctx, apr_pool_t *pool)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="structsvn__error__t.html">svn_error_t</a>* svn_client_merge2 </td>
|
|
<td>(</td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>source1</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>revision1</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>source2</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>revision2</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>target_wcpath</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>recurse</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>ignore_ancestry</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>force</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>dry_run</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const apr_array_header_t * </td>
|
|
<td class="paramname"> <em>merge_options</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> * </td>
|
|
<td class="paramname"> <em>ctx</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_pool_t * </td>
|
|
<td class="paramname"> <em>pool</em></td><td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>)</td>
|
|
<td></td><td></td><td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
Similar to <a class="el" href="group__Merge.html#g5acd0a13c8c9d608ff1fd5df1f2e30f1" title="Merge changes from source1/revision1 to source2/revision2 into the working-copy path...">svn_client_merge3()</a>, but with <em>record_only</em> set to <code>FALSE</code>, and <em>depth</em> set according to <em>recurse:</em> if <em>recurse</em> is TRUE, set <em>depth</em> to <code>svn_depth_infinity</code>, if <em>recurse</em> is FALSE, set <em>depth</em> to <code>svn_depth_files</code>.
|
|
<p>
|
|
<dl compact><dt><b><a class="el" href="deprecated.html#_deprecated000055">Deprecated:</a></b></dt><dd>Provided for backward compatibility with the 1.4 API.</dd></dl>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.4. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="g5acd0a13c8c9d608ff1fd5df1f2e30f1"></a><!-- doxytag: member="svn_client.h::svn_client_merge3" ref="g5acd0a13c8c9d608ff1fd5df1f2e30f1" args="(const char *source1, const svn_opt_revision_t *revision1, const char *source2, const svn_opt_revision_t *revision2, const char *target_wcpath, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t force, svn_boolean_t record_only, svn_boolean_t dry_run, const apr_array_header_t *merge_options, svn_client_ctx_t *ctx, apr_pool_t *pool)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="structsvn__error__t.html">svn_error_t</a>* svn_client_merge3 </td>
|
|
<td>(</td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>source1</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>revision1</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>source2</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>revision2</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>target_wcpath</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#21dd8b080111fa6fb5d59156299f3a2c">svn_depth_t</a> </td>
|
|
<td class="paramname"> <em>depth</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>ignore_ancestry</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>force</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>record_only</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>dry_run</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const apr_array_header_t * </td>
|
|
<td class="paramname"> <em>merge_options</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> * </td>
|
|
<td class="paramname"> <em>ctx</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_pool_t * </td>
|
|
<td class="paramname"> <em>pool</em></td><td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>)</td>
|
|
<td></td><td></td><td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
Merge changes from <em>source1/<em>revision1</em> to</em> <em>source2/<em>revision2</em> into</em> the working-copy path <em>target_wcpath</em>.
|
|
<p>
|
|
<em>source1</em> and <em>source2</em> are either URLs that refer to entries in the repository, or paths to entries in the working copy.<p>
|
|
By "merging", we mean: apply file differences using <a class="el" href="group__svn__wc.html#g093302c0cd37f161c185dfc95e10f8d1" title="Similar to svn_wc_merge2(), but with merge_options set to NULL.">svn_wc_merge()</a>, and schedule additions & deletions when appropriate.<p>
|
|
<em>source1</em> and <em>source2</em> must both represent the same node kind -- that is, if <em>source1</em> is a directory, <em>source2</em> must also be, and if <em>source1</em> is a file, <em>source2</em> must also be.<p>
|
|
If either <em>revision1</em> or <em>revision2</em> has an `unspecified' or unrecognized `kind', return <code>SVN_ERR_CLIENT_BAD_REVISION</code>.<p>
|
|
If <em>depth</em> is <code>svn_depth_infinity</code>, merge fully recursively. Else if <code>svn_depth_immediates</code>, merge changes at most to files that are immediate children of <em>target_wcpath</em> and to directory properties of <em>target_wcpath</em> and its immediate subdirectory children. Else if <code>svn_depth_files</code>, merge at most to immediate file children of <em>target_wcpath</em> and to <em>target_wcpath</em> itself. Else if <code>svn_depth_empty</code>, apply changes only to <em>target_wcpath</em> (i.e., directory property changes only)<p>
|
|
If <em>depth</em> is <code>svn_depth_unknown</code>, use the depth of <em>target_wcpath</em>.<p>
|
|
Use <em>ignore_ancestry</em> to control whether or not items being diffed will be checked for relatedness first. Unrelated items are typically transmitted to the editor as a deletion of one thing and the addition of another, but if this flag is TRUE, unrelated items will be diffed as if they were related.<p>
|
|
If <em>force</em> is not set and the merge involves deleting locally modified or unversioned items the operation will fail. If <em>force</em> is set such items will be deleted.<p>
|
|
<em>merge_options</em> (an array of <code>const char *</code>), if non-NULL, is used to pass additional command line arguments to the merge processes (internal or external). <dl class="see" compact><dt><b>See also:</b></dt><dd><a class="el" href="svn__diff_8h.html#212d408eee817f2193737fa4e8307a9e" title="Parse args, an array of const char * command line switches and adjust options accordingly...">svn_diff_file_options_parse()</a>.</dd></dl>
|
|
If <em>ctx->notify_func2</em> is non-NULL, then call <em>ctx->notify_func2</em> with <em>ctx->notify_baton2</em> once for each merged target, passing the target's local path.<p>
|
|
If <em>record_only</em> is TRUE, the merge isn't actually performed, but the mergeinfo for the revisions which would've been merged is recorded in the working copy (and must be subsequently committed back to the repository).<p>
|
|
If <em>dry_run</em> is TRUE, the merge is carried out, and full notification feedback is provided, but the working copy is not modified.<p>
|
|
The authentication baton cached in <em>ctx</em> is used to communicate with the repository.<p>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.5. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="gb3b7ffa4842894088a311d69bf4f39b8"></a><!-- doxytag: member="svn_client.h::svn_client_merge_peg" ref="gb3b7ffa4842894088a311d69bf4f39b8" args="(const char *source, const svn_opt_revision_t *revision1, const svn_opt_revision_t *revision2, const svn_opt_revision_t *peg_revision, const char *target_wcpath, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t force, svn_boolean_t dry_run, svn_client_ctx_t *ctx, apr_pool_t *pool)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="structsvn__error__t.html">svn_error_t</a>* svn_client_merge_peg </td>
|
|
<td>(</td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>source</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>revision1</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>revision2</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>peg_revision</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>target_wcpath</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>recurse</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>ignore_ancestry</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>force</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>dry_run</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> * </td>
|
|
<td class="paramname"> <em>ctx</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_pool_t * </td>
|
|
<td class="paramname"> <em>pool</em></td><td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>)</td>
|
|
<td></td><td></td><td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
Similar to <a class="el" href="group__Merge.html#gdbb47dae0b3e6e0ae27aad5509840f04" title="Similar to svn_client_merge_peg3(), but with record_only set to FALSE, and depth...">svn_client_merge_peg2()</a>, but with <em>merge_options</em> set to NULL.
|
|
<p>
|
|
<dl compact><dt><b><a class="el" href="deprecated.html#_deprecated000058">Deprecated:</a></b></dt><dd>Provided for backwards compatibility with the 1.3 API.</dd></dl>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.1. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="gdbb47dae0b3e6e0ae27aad5509840f04"></a><!-- doxytag: member="svn_client.h::svn_client_merge_peg2" ref="gdbb47dae0b3e6e0ae27aad5509840f04" args="(const char *source, const svn_opt_revision_t *revision1, const svn_opt_revision_t *revision2, const svn_opt_revision_t *peg_revision, const char *target_wcpath, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t force, svn_boolean_t dry_run, const apr_array_header_t *merge_options, svn_client_ctx_t *ctx, apr_pool_t *pool)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="structsvn__error__t.html">svn_error_t</a>* svn_client_merge_peg2 </td>
|
|
<td>(</td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>source</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>revision1</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>revision2</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>peg_revision</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>target_wcpath</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>recurse</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>ignore_ancestry</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>force</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>dry_run</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const apr_array_header_t * </td>
|
|
<td class="paramname"> <em>merge_options</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> * </td>
|
|
<td class="paramname"> <em>ctx</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_pool_t * </td>
|
|
<td class="paramname"> <em>pool</em></td><td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>)</td>
|
|
<td></td><td></td><td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
Similar to <a class="el" href="group__Merge.html#g12005bd5f73bafa3ee56349ec7cf3716" title="Merge the changes between the filesystem object source in peg revision peg_revision...">svn_client_merge_peg3()</a>, but with <em>record_only</em> set to <code>FALSE</code>, and <em>depth</em> set according to <em>recurse:</em> if <em>recurse</em> is TRUE, set <em>depth</em> to <code>svn_depth_infinity</code>, if <em>recurse</em> is FALSE, set <em>depth</em> to <code>svn_depth_files</code>.
|
|
<p>
|
|
<dl compact><dt><b><a class="el" href="deprecated.html#_deprecated000057">Deprecated:</a></b></dt><dd>Provided for backwards compatibility with the 1.3 API.</dd></dl>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.4. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="g12005bd5f73bafa3ee56349ec7cf3716"></a><!-- doxytag: member="svn_client.h::svn_client_merge_peg3" ref="g12005bd5f73bafa3ee56349ec7cf3716" args="(const char *source, const apr_array_header_t *ranges_to_merge, const svn_opt_revision_t *peg_revision, const char *target_wcpath, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t force, svn_boolean_t record_only, svn_boolean_t dry_run, const apr_array_header_t *merge_options, svn_client_ctx_t *ctx, apr_pool_t *pool)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="structsvn__error__t.html">svn_error_t</a>* svn_client_merge_peg3 </td>
|
|
<td>(</td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>source</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const apr_array_header_t * </td>
|
|
<td class="paramname"> <em>ranges_to_merge</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>peg_revision</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>target_wcpath</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#21dd8b080111fa6fb5d59156299f3a2c">svn_depth_t</a> </td>
|
|
<td class="paramname"> <em>depth</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>ignore_ancestry</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>force</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>record_only</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>dry_run</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const apr_array_header_t * </td>
|
|
<td class="paramname"> <em>merge_options</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> * </td>
|
|
<td class="paramname"> <em>ctx</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_pool_t * </td>
|
|
<td class="paramname"> <em>pool</em></td><td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>)</td>
|
|
<td></td><td></td><td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
Merge the changes between the filesystem object <em>source</em> in peg revision <em>peg_revision</em>, as it changed between the ranges described in <em>ranges_to_merge</em>.
|
|
<p>
|
|
<em>ranges_to_merge</em> is an array of <code><a class="el" href="structsvn__opt__revision__range__t.html" title="A revision range, specified in one of svn_opt_revision_kind ways.">svn_opt_revision_range_t</a> *</code> ranges. These ranges may describe additive and/or subtractive merge ranges, they may overlap fully or partially, and/or they may partially or fully negate each other. This rangelist is not required to be sorted. If any revision in the list of provided ranges has an `unspecified' or unrecognized `kind', return <code>SVN_ERR_CLIENT_BAD_REVISION</code>.<p>
|
|
All other options are handled identically to <a class="el" href="group__Merge.html#g5acd0a13c8c9d608ff1fd5df1f2e30f1" title="Merge changes from source1/revision1 to source2/revision2 into the working-copy path...">svn_client_merge3()</a>.<p>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.5. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="gc8791af39c490be7eff250929a68fb41"></a><!-- doxytag: member="svn_client.h::svn_client_merge_reintegrate" ref="gc8791af39c490be7eff250929a68fb41" args="(const char *source, const svn_opt_revision_t *peg_revision, const char *target_wcpath, svn_boolean_t dry_run, const apr_array_header_t *merge_options, svn_client_ctx_t *ctx, apr_pool_t *pool)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="structsvn__error__t.html">svn_error_t</a>* svn_client_merge_reintegrate </td>
|
|
<td>(</td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>source</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>peg_revision</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>target_wcpath</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>dry_run</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const apr_array_header_t * </td>
|
|
<td class="paramname"> <em>merge_options</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> * </td>
|
|
<td class="paramname"> <em>ctx</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_pool_t * </td>
|
|
<td class="paramname"> <em>pool</em></td><td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>)</td>
|
|
<td></td><td></td><td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
Perform a reintegration merge of <em>source</em> at <em>peg_revision</em> into .
|
|
<p>
|
|
<em>target_wc_path</em> must be a single-revision, <code>svn_depth_infinity</code>, pristine, unswitched working copy -- in other words, it must reflect a single revision tree, the "target". The mergeinfo on <em>source</em> must reflect that all of the target has been merged into it. Then this behaves like a merge with <a class="el" href="group__Merge.html#g5acd0a13c8c9d608ff1fd5df1f2e30f1" title="Merge changes from source1/revision1 to source2/revision2 into the working-copy path...">svn_client_merge3()</a> from the target's URL to the source.<p>
|
|
All other options are handled identically to <a class="el" href="group__Merge.html#g5acd0a13c8c9d608ff1fd5df1f2e30f1" title="Merge changes from source1/revision1 to source2/revision2 into the working-copy path...">svn_client_merge3()</a>. The depth of the merge is always <code>svn_depth_infinity</code>.<p>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.5. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="gc53de23a6617aeba3a30844171fa3439"></a><!-- doxytag: member="svn_client.h::svn_client_mergeinfo_get_merged" ref="gc53de23a6617aeba3a30844171fa3439" args="(apr_hash_t **mergeinfo, const char *path_or_url, const svn_opt_revision_t *peg_revision, svn_client_ctx_t *ctx, apr_pool_t *pool)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="structsvn__error__t.html">svn_error_t</a>* svn_client_mergeinfo_get_merged </td>
|
|
<td>(</td>
|
|
<td class="paramtype">apr_hash_t ** </td>
|
|
<td class="paramname"> <em>mergeinfo</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>path_or_url</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>peg_revision</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> * </td>
|
|
<td class="paramname"> <em>ctx</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_pool_t * </td>
|
|
<td class="paramname"> <em>pool</em></td><td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>)</td>
|
|
<td></td><td></td><td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
Set <em>*mergeinfo</em> to a hash mapping <code>const char *</code> merge source URLs to <code>apr_array_header_t *</code> rangelists (arrays of <code><a class="el" href="structsvn__merge__range__t.html" title="Mergeinfo representing a merge of a range of revisions.">svn_merge_range_t</a> *</code> ranges) describing the ranges which have been merged into <em>path_or_url</em> as of <em>peg_revision</em>, or <code>NULL</code> if there is no mergeinfo.
|
|
<p>
|
|
Use <em>pool</em> for all necessary allocations.<p>
|
|
If the server doesn't support retrieval of mergeinfo (which will never happen for <a href="file://">file://</a> URLs), return an <code>SVN_ERR_UNSUPPORTED_FEATURE</code> error.<p>
|
|
<dl class="note" compact><dt><b>Note:</b></dt><dd>Unlike most APIs which deal with mergeinfo, this one returns data where the keys of the hash are absolute repository URLs rather than repository filesystem paths.</dd></dl>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.5. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="g1ebab9ce5d36348a5765b594bdaa73cd"></a><!-- doxytag: member="svn_client.h::svn_client_mergeinfo_log_eligible" ref="g1ebab9ce5d36348a5765b594bdaa73cd" args="(const char *path_or_url, const svn_opt_revision_t *peg_revision, const char *merge_source_path_or_url, const svn_opt_revision_t *src_peg_revision, svn_log_entry_receiver_t receiver, void *receiver_baton, svn_boolean_t discover_changed_paths, const apr_array_header_t *revprops, svn_client_ctx_t *ctx, apr_pool_t *pool)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="structsvn__error__t.html">svn_error_t</a>* svn_client_mergeinfo_log_eligible </td>
|
|
<td>(</td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>path_or_url</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>peg_revision</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>merge_source_path_or_url</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>src_peg_revision</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#fb30054d6301afbcd8b00d8dc11d7ddb">svn_log_entry_receiver_t</a> </td>
|
|
<td class="paramname"> <em>receiver</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">void * </td>
|
|
<td class="paramname"> <em>receiver_baton</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>discover_changed_paths</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const apr_array_header_t * </td>
|
|
<td class="paramname"> <em>revprops</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> * </td>
|
|
<td class="paramname"> <em>ctx</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_pool_t * </td>
|
|
<td class="paramname"> <em>pool</em></td><td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>)</td>
|
|
<td></td><td></td><td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
Drive log entry callbacks <em>receiver</em> / <em>receiver_baton</em> with the revisions eligible for merge from <em>merge_source_path_or_url</em> (as of <em>src_peg_revision</em>) into <em>path_or_url</em> (as of <em>peg_revision</em>).
|
|
<p>
|
|
<em>ctx</em> is a context used for authentication.<p>
|
|
<em>discover_changed_paths</em> and <em>revprops</em> are the same as for <a class="el" href="group__Log.html#g51b2d03e1d9effca849bd2739187a01a" title="Invoke receiver with receiver_baton on each log message from start to end in turn...">svn_client_log4()</a>. Use <em>pool</em> for all necessary allocations.<p>
|
|
If the server doesn't support retrieval of mergeinfo, return an <code>SVN_ERR_UNSUPPORTED_FEATURE</code> error.<p>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.5. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="g5490a793f43eaaa306d645d5b1b3bdaa"></a><!-- doxytag: member="svn_client.h::svn_client_mergeinfo_log_merged" ref="g5490a793f43eaaa306d645d5b1b3bdaa" args="(const char *path_or_url, const svn_opt_revision_t *peg_revision, const char *merge_source_path_or_url, const svn_opt_revision_t *src_peg_revision, svn_log_entry_receiver_t receiver, void *receiver_baton, svn_boolean_t discover_changed_paths, const apr_array_header_t *revprops, svn_client_ctx_t *ctx, apr_pool_t *pool)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="structsvn__error__t.html">svn_error_t</a>* svn_client_mergeinfo_log_merged </td>
|
|
<td>(</td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>path_or_url</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>peg_revision</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>merge_source_path_or_url</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>src_peg_revision</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#fb30054d6301afbcd8b00d8dc11d7ddb">svn_log_entry_receiver_t</a> </td>
|
|
<td class="paramname"> <em>receiver</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">void * </td>
|
|
<td class="paramname"> <em>receiver_baton</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>discover_changed_paths</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const apr_array_header_t * </td>
|
|
<td class="paramname"> <em>revprops</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> * </td>
|
|
<td class="paramname"> <em>ctx</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_pool_t * </td>
|
|
<td class="paramname"> <em>pool</em></td><td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>)</td>
|
|
<td></td><td></td><td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
Drive log entry callbacks <em>receiver</em> / <em>receiver_baton</em> with the revisions merged from <em>merge_source_path_or_url</em> (as of <em>src_peg_revision</em>) into <em>path_or_url</em> (as of <em>peg_revision</em>).
|
|
<p>
|
|
<em>ctx</em> is a context used for authentication.<p>
|
|
<em>discover_changed_paths</em> and <em>revprops</em> are the same as for <a class="el" href="group__Log.html#g51b2d03e1d9effca849bd2739187a01a" title="Invoke receiver with receiver_baton on each log message from start to end in turn...">svn_client_log4()</a>. Use <em>pool</em> for all necessary allocations.<p>
|
|
If the server doesn't support retrieval of mergeinfo, return an <code>SVN_ERR_UNSUPPORTED_FEATURE</code> error.<p>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.5. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="g05713f5c424fd4a2f20a09447075b048"></a><!-- doxytag: member="svn_client.h::svn_client_suggest_merge_sources" ref="g05713f5c424fd4a2f20a09447075b048" args="(apr_array_header_t **suggestions, const char *path_or_url, const svn_opt_revision_t *peg_revision, svn_client_ctx_t *ctx, apr_pool_t *pool)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="structsvn__error__t.html">svn_error_t</a>* svn_client_suggest_merge_sources </td>
|
|
<td>(</td>
|
|
<td class="paramtype">apr_array_header_t ** </td>
|
|
<td class="paramname"> <em>suggestions</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>path_or_url</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>peg_revision</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> * </td>
|
|
<td class="paramname"> <em>ctx</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_pool_t * </td>
|
|
<td class="paramname"> <em>pool</em></td><td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>)</td>
|
|
<td></td><td></td><td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
Set <em>suggestions</em> to an ordered array of <code>const</code> char * potential merge sources (expressed as full repository URLs) for <em>path_or_url</em> at <em>peg_revision</em>.
|
|
<p>
|
|
<em>path_or_url</em> is a working copy path or repository URL. <em>ctx</em> is a context used for authentication in the repository case. Use <em>pool</em> for all allocations.<p>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.5. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
</div>
|
|
<hr size="1"><address style="text-align: right;"><small>Generated on Fri Oct 24 16:18:29 2008 for Subversion by
|
|
<a href="http://www.doxygen.org/index.html">
|
|
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
|
|
</body>
|
|
</html>
|