Tweaked mergeready, and added/changed some items in the merge support files.

- Legacy-Id: 16605

bin/mergeready

@@ -335,6 +335,11 @@ for entry in ready:
             ready_commits[when] = output_line
         else:
             not_passed[when] = output_line
+
+hold_revs = {}
+for rev, repo, branch in hold:
+    hold_revs[rev] = branch
+
 unmerged_branch_commits = {}
 for branch in branches:
     note("Fetching commit information for branch %s" % branch)
@@ -350,7 +355,7 @@ for branch in branches:
             if not ' (from ' in line and not mod:
                 mod = True
         elif re.search('^-{72}$', line) and rev and mod:
-            if not rev in merged_revs:
+            if not rev in merged_revs and not rev in hold_revs:
                 commits.append(rev)
             rev = None
             mod = False

hold-for-merge

@@ -1,8 +1,9 @@
 # -*- conf-mode -*-
 
 /personal/pusateri/6.99.2.dev0@16564	# Code review found an issue
-/personal/rjs/6.99.2.dev0@16583		# internal branch fixup
-/personal/rjs/6.99.2.dev0@16569		# internal branch fixup
+/personal/rjs/6.99.2.dev0@16581		# internal branch fixup
+/personal/rjs/6.99.2.dev0@16579		# internal branch fixup
+/personal/rjs/6.99.2.dev0@16568		# internal branch fixup
 /personal/rcross/6.81.3.dev0@15262	# Secretariat admin access to Document has drawbacks
 /personal/sbirkholz/mtgreg3@14074	# reviewed with issues; feedback sent
 /personal/sbirkholz/meeting_registration@13969 # manual branch merge

ready-for-merge

@@ -7,6 +7,9 @@
 
 # --- Add entries at the top ---
 
+/personal/rjs/6.99.2.dev0@16603
+/personal/rjs/6.99.2.dev0@16601
+
 /personal/housley/6.94.2.dev0@16126
 /personal/housley/6.94.2.dev0@16125
 /personal/housley/6.94.2.dev0@16087