You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by rh...@apache.org on 2011/04/28 22:47:49 UTC

svn commit: r1097602 - /subversion/trunk/subversion/libsvn_client/merge.c

Author: rhuijben
Date: Thu Apr 28 20:47:48 2011
New Revision: 1097602

URL: http://svn.apache.org/viewvc?rev=1097602&view=rev
Log:
* subversion/libsvn_client/merge.c
  (record_skips): Following up on r1097601 vs r1097598, unbreak compilation.

Modified:
    subversion/trunk/subversion/libsvn_client/merge.c

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1097602&r1=1097601&r2=1097602&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu Apr 28 20:47:48 2011
@@ -4584,7 +4584,7 @@ record_skips(const char *mergeinfo_path,
       /* Before we override, make sure this is a versioned path, it might
          be an external or missing from disk due to authz restrictions. */
       SVN_ERR(perform_obstruction_check(&obstruction_state,
-                                        NULL, NULL, NULL, NULL, NULL,
+                                        NULL, NULL, NULL,
                                         merge_b, skipped_abspath,
                                         svn_node_unknown, pool));
       if (obstruction_state == svn_wc_notify_state_obstructed