--- a/contrib/synthrepo.py Fri Sep 12 12:28:30 2014 -0700
+++ b/contrib/synthrepo.py Fri Sep 12 17:43:37 2014 -0400
@@ -307,7 +307,8 @@
# the number of heads will grow without bound if we use a pure
# model, so artificially constrain their proliferation
- if pick(parents) == 2 or len(heads) > random.randint(1, 20):
+ toomanyheads = len(heads) > random.randint(1, 20)
+ if p2distance[0] and (pick(parents) == 2 or toomanyheads):
r2, p2 = pickhead(heads.difference([r1]), p2distance)
else:
r2, p2 = nullrev, nullid