Author: rinrab
Date: Thu Nov 28 21:41:39 2024
New Revision: 1922199
URL: http://svn.apache.org/viewvc?rev=1922199&view=rev
Log:
On the 'apply-processor' branch: Remove a call of cb_table->updated_path()
callback, since we are invoking it later on in record_update_add() with the
same args.
Should be no functional changes.
* subversion/libsvn_client/merge_processor.c
(merge_file_added): Ditto.
Modified:
subversion/branches/apply-processor/subversion/libsvn_client/merge_processor.c
Modified:
subversion/branches/apply-processor/subversion/libsvn_client/merge_processor.c
URL:
http://svn.apache.org/viewvc/subversion/branches/apply-processor/subversion/libsvn_client/merge_processor.c?rev=1922199&r1=1922198&r2=1922199&view=diff
==============================================================================
---
subversion/branches/apply-processor/subversion/libsvn_client/merge_processor.c
(original)
+++
subversion/branches/apply-processor/subversion/libsvn_client/merge_processor.c
Thu Nov 28 21:41:39 2024
@@ -1461,14 +1461,6 @@ merge_file_added(const char *relpath,
return SVN_NO_ERROR;
}
- if (merge_b->cb_table && merge_b->cb_table->updated_path
- && ( !fb->parent_baton || !fb->parent_baton->added))
- {
- SVN_ERR(merge_b->cb_table->updated_path(merge_b->cb_baton, local_abspath,
- svn_wc_notify_update_add,
- scratch_pool));
- }
-
if (!merge_b->dry_run)
{
const char *copyfrom_url;
