HEAD files are needed for conflict management
Bug #1505701 reported by
Ann Taraday
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| neutron |
Fix Released
|
Low
|
Ann Taraday | ||
Bug Description
Some time ago we merged change https:/
The problem is that the original idea of HEAD file was not only to validate revisions, so as not to allow outdated changes go into merge queue, that could be very important for the end of the cycle when a lot of patches get approved.
| Changed in neutron: | |
| importance: | Undecided → Low |
| status: | New → Confirmed |
| Changed in neutron: | |
| status: | Confirmed → In Progress |
| Changed in neutron: | |
| assignee: | Ann Kamyshnikova (akamyshnikova) → Henry Gessau (gessau) |
| Changed in neutron: | |
| assignee: | Henry Gessau (gessau) → Ann Kamyshnikova (akamyshnikova) |
Revision history for this message
| OpenStack Infra (hudson-openstack) wrote Fix merged to neutron (master) | #1 |
| Changed in neutron: | |
| status: | In Progress → Fix Committed |
| Changed in neutron: | |
| status: | Fix Committed → Fix Released |
To post a comment you must log in.
Reviewed: https:/
Committed: https:/
Submitter: Jenkins
Branch: master
commit f144a283ea4f797
Author: AKamyshnikova <email address hidden>
Date: Thu Oct 8 18:18:21 2015 +0300
Per-branch HEAD files for conflict management
We have pep8 check for validation revisions, but it allows
outdated changes go into merge queue. To prevent this added
CONTRACT_HEAD, EXPAND_HEAD files.
Closes-bug: #1505701
Change-Id: Ie4b727e55a0b1e