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/03/06 13:21:57 UTC
svn commit: r1664598 -
/subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
Author: julianfoad
Date: Fri Mar 6 12:21:56 2015
New Revision: 1664598
URL: http://svn.apache.org/r1664598
Log:
On the 'move-tracking-2' branch: Clarify code that generates id sequences.
* subversion/include/svn_iter.h
(PRETTY_IDS): New, defined in debug mode.
(svn_branch_family_add_new_subfamily): Use pretty ids if PRETTY_IDS is defined,
else start all id sequences from zero.
Modified:
subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c?rev=1664598&r1=1664597&r2=1664598&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c Fri Mar 6 12:21:56 2015
@@ -153,15 +153,28 @@ svn_branch_family_add_new_element(svn_br
return eid;
}
+#ifdef SVN_DEBUG
+/* If defined, branch-sibling-ids and element-ids start from 10x and 100x
+ * the family-id for easier debugging; else they always start from zero. */
+#define PRETTY_IDS
+#endif
+
svn_branch_family_t *
svn_branch_family_add_new_subfamily(svn_branch_family_t *outer_family)
{
svn_branch_repos_t *repos = outer_family->repos;
int fid = repos->next_fid++;
+#ifdef PRETTY_IDS
+ int first_bid = fid * 10;
+ int first_eid = fid * 100;
+#else
+ int first_bid = 0;
+ int first_eid = 0;
+#endif
svn_branch_family_t *family
= svn_branch_family_create(repos, fid,
- fid * 10, fid * 10,
- fid * 100, fid * 100,
+ first_bid, first_bid,
+ first_eid, first_eid,
outer_family->pool);
/* Register the family */