Branch can be rejected because prerequisite not merged but approved
Bug #900731 reported by
Didier Roche-Tolomelli
This bug affects 5 people
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Tarmac |
Fix Released
|
Medium
|
David Britton | ||
Bug Description
If both a prerequisite and dependant branch are approved and tarmac starts by handling the dependant branch first, it will reject it telling that the prerequisite branch isn't merged yet as so revert the approved status to "needs review".
The idea is to handle this case better and postpone the current approval checks at the end (to check the real status of the prerequisite branch).
Related branches
lp:~dpb/tarmac/better-prereq-branches
- dobey: Approve
-
Diff: 347 lines (+162/-23)5 files modified.bzrignore (+1/-0)
docs/introduction.txt (+15/-1)
tarmac/bin/commands.py (+43/-13)
tarmac/tests/__init__.py (+1/-0)
tarmac/tests/test_commands.py (+102/-9)
Revision history for this message
| Chris Glass (tribaal) wrote | #1 |
| Changed in tarmac: | |
| status: | New → In Progress |
| assignee: | nobody → Chris Glass (tribaal) |
| Changed in tarmac: | |
| status: | In Progress → New |
| assignee: | Chris Glass (tribaal) → nobody |
| Changed in tarmac: | |
| status: | New → Confirmed |
| Changed in tarmac: | |
| importance: | Undecided → Medium |
| Changed in tarmac: | |
| assignee: | nobody → David Britton (davidpbritton) |
| status: | Confirmed → In Progress |
| Changed in tarmac: | |
| status: | In Progress → Fix Committed |
| Changed in tarmac: | |
| status: | Fix Committed → Fix Released |
To post a comment you must log in.
We are having the same problem (landscape team), and I think my branch solves it.
Basically what I do is order the proposals by dependency depth, merging branches that have no prerequisites first.
I will give it another spin and propose for merging if all is good.