You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2015/04/29 12:42:32 UTC
svn commit: r1676714 -
/subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c
Author: julianfoad
Date: Wed Apr 29 10:42:32 2015
New Revision: 1676714
URL: http://svn.apache.org/r1676714
Log:
On the 'move-tracking-2' branch: Elide a trivial function.
* subversion/libsvn_delta/compat3e.c
(same_family_and_element): Delete.
(drive_changes_r): Put the equivalent comparison in line.
Modified:
subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c?rev=1676714&r1=1676713&r2=1676714&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c Wed Apr 29 10:42:32 2015
@@ -1203,18 +1203,6 @@ get_immediate_children_names(apr_hash_t
return children;
}
-/* Return true iff EL_REV1 and EL_REV2 identify the same element.
- */
-static svn_boolean_t
-same_family_and_element(const svn_branch_el_rev_id_t *el_rev1,
- const svn_branch_el_rev_id_t *el_rev2)
-{
- if (el_rev1->eid != el_rev2->eid)
- return FALSE;
-
- return TRUE;
-}
-
/* Generate Ev1 instructions to edit from a current state to a final state
* at RRPATH, recursing for child paths of RRPATH.
*
@@ -1293,7 +1281,7 @@ drive_changes_r(const char *rrpath,
eb->edited_rev_root->repos,
scratch_pool, scratch_pool));
- succession = same_family_and_element(pred_el_rev, final_el_rev);
+ succession = (pred_el_rev->eid == final_el_rev->eid);
}
else
{