Tweaked bin/mergeready to look also for ../ready-for-merge
- Legacy-Id: 15821
This commit is contained in:
parent
75b0f0dacc
commit
5d87de67cd
|
@ -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')
|
||||
|
|
Loading…
Reference in a new issue