Author: rinrab
Date: Tue Nov 26 23:39:41 2024
New Revision: 1922143
URL: http://svn.apache.org/viewvc?rev=1922143&view=rev
Log:
On the 'apply-processor' branch: Follow-up to r1922142: break from the
switch after handling svn_wc_notify_skip.
Modified:
subversion/branches/apply-processor/subversion/libsvn_client/merge.c
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=1922143&r1=1922142&r2=1922143&view=diff
==============================================================================
--- subversion/branches/apply-processor/subversion/libsvn_client/merge.c
(original)
+++ subversion/branches/apply-processor/subversion/libsvn_client/merge.c Tue
Nov 26 23:39:41 2024
@@ -1338,6 +1338,7 @@ notify_merging(void *baton,
{
store_path(merge_b->skipped_abspaths, notify->path);
}
+ break;
}
notify_merge_begin(b, notify->path,
