subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pbu...@apache.org
Subject svn commit: r1451328 - /subversion/trunk/subversion/svn/merge-cmd.c
Date Thu, 28 Feb 2013 20:17:08 GMT
Author: pburba
Date: Thu Feb 28 20:17:08 2013
New Revision: 1451328

URL: http://svn.apache.org/r1451328
Log:
* subversion/svn/merge-cmd.c

  (run_merge): Remove unreferenced argument.

  (svn_cl__merge): Update sole caller to run_merge().


Modified:
    subversion/trunk/subversion/svn/merge-cmd.c

Modified: subversion/trunk/subversion/svn/merge-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/merge-cmd.c?rev=1451328&r1=1451327&r2=1451328&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/merge-cmd.c (original)
+++ subversion/trunk/subversion/svn/merge-cmd.c Thu Feb 28 20:17:08 2013
@@ -152,7 +152,6 @@ run_merge(svn_boolean_t two_sources_spec
           const char *sourcepath1,
           svn_opt_revision_t peg_revision1,
           const char *sourcepath2,
-          svn_opt_revision_t peg_revision2,
           const char *targetpath,
           apr_array_header_t *ranges_to_merge,
           svn_opt_revision_t first_range_start,
@@ -569,7 +568,7 @@ svn_cl__merge(apr_getopt_t *os,
 
   merge_err = run_merge(two_sources_specified,
                         sourcepath1, peg_revision1,
-                        sourcepath2, peg_revision2,
+                        sourcepath2,
                         targetpath,
                         ranges_to_merge, first_range_start, first_range_end,
                         opt_state, options, ctx, pool);



Mime
View raw message