subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1227567 - /subversion/trunk/subversion/libsvn_client/merge.c
Date Thu, 05 Jan 2012 12:23:52 GMT
Author: julianfoad
Date: Thu Jan  5 12:23:52 2012
New Revision: 1227567

URL: http://svn.apache.org/viewvc?rev=1227567&view=rev
Log:
* subversion/libsvn_client/merge.c
  (get_full_mergeinfo): Eliminate a redundant variable. Tweak white space.

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=1227567&r1=1227566&r2=1227567&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu Jan  5 12:23:52 2012
@@ -3490,11 +3490,9 @@ get_full_mergeinfo(svn_mergeinfo_t *reco
   /* First, we get the real mergeinfo. */
   if (recorded_mergeinfo)
     {
-      svn_boolean_t inherited_from_repos;
-
       SVN_ERR(svn_client__get_wc_or_repos_mergeinfo(recorded_mergeinfo,
                                                     inherited,
-                                                    &inherited_from_repos,
+                                                    NULL /* from_repos */,
                                                     FALSE,
                                                     inherit, ra_session,
                                                     target_abspath,
@@ -3509,9 +3507,8 @@ get_full_mergeinfo(svn_mergeinfo_t *reco
       svn_revnum_t target_rev;
 
       /* Assert that we have sane input. */
-      SVN_ERR_ASSERT(SVN_IS_VALID_REVNUM(start)
-                 && SVN_IS_VALID_REVNUM(end)
-                 && (start > end));
+      SVN_ERR_ASSERT(SVN_IS_VALID_REVNUM(start) && SVN_IS_VALID_REVNUM(end)
+                     && (start > end));
 
       /* Retrieve the origin (original_*) of the node, or just the
          url if the node was not copied. */



Mime
View raw message