Tweaked bin/mergeready to look also for ../ready-for-merge

levkowetz · levkowetz · commit 5d87de67cd22 · 2018-12-14T21:21:38.000Z
- Legacy-Id: 15821
diff --git a/bin/mergeready b/bin/mergeready
@@ -282,6 +282,7 @@ def get_ready_commits(repo, tree):
     return list
     
 ready  = get_changeset_list_from_file(repo, 'ready-for-merge')
+ready += get_changeset_list_from_file(repo, '../ready-for-merge')
 hold   = get_changeset_list_from_file(repo, 'hold-for-merge')
 hold  += get_changeset_list_from_file(repo, '../hold-for-merge')
 ready += get_ready_commits(repo, 'personal')
