Allow people to uncommit new commits.
Bug #1509250 reported by
Robert Bruce Park
on 2015-10-23
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| | CI Train [cu2d] |
Fix Released
|
Medium
|
Robert Bruce Park | |
Bug Description
Consider this scenario:
1. Lander has a silo with an MP in it, silo is built.
2. Lander pushes new commit to MP.
3. Train detects new commit and marks silo dirty.
4. Lander changes mind, and undoes commit with 'bzr uncommit' and 'bzr push --overwrite'
5. Commits now match again, however silo dirty state isn't cleared, and WATCH_ONLY build doesn't clear it.
Solution:
1. When marking a silo dirty, we need to record whether the silo is dirty because a new commit was found or because a conflicting silo was published.
2. The 'unbuilt' phase which marks the silo dirty should grow a check to notice that the new commit is gone and clear the dirty flag.
Related branches
lp:~robru/cupstream2distro/fix-statuses
- Robert Bruce Park (community): Approve on 2015-11-18
- PS Jenkins bot: Approve (continuous-integration) on 2015-11-18
-
Diff: 2206 lines (+524/-619)29 files modifiedcitrain/autopkgtests.py (+3/-1)
citrain/build.py (+12/-22)
citrain/jenkins-templates/check-publication-migration.xml.tmpl (+1/-1)
citrain/merge_clean.py (+3/-3)
citrain/migration.py (+10/-18)
citrain/prepare_silo.py (+1/-1)
citrain/publisher.py (+2/-2)
citrain/recipes/base.py (+141/-111)
citrain/recipes/manager.py (+13/-1)
citrain/recipes/merge.py (+12/-5)
citrain/revert.py (+3/-7)
cupstream2distro/archive.py (+23/-15)
cupstream2distro/errors.py (+2/-20)
cupstream2distro/packagemanager.py (+12/-12)
cupstream2distro/silomanager.py (+5/-59)
cupstream2distro/version.py (+1/-1)
tests/unit/test_archive.py (+9/-26)
tests/unit/test_packagemanager.py (+1/-10)
tests/unit/test_recipe_base.py (+135/-110)
tests/unit/test_recipe_manager.py (+29/-0)
tests/unit/test_recipe_merge.py (+32/-3)
tests/unit/test_script_autopkgtests.py (+2/-1)
tests/unit/test_script_build.py (+24/-49)
tests/unit/test_script_merge_clean.py (+3/-1)
tests/unit/test_script_migration.py (+34/-30)
tests/unit/test_script_prepare_silo.py (+1/-1)
tests/unit/test_script_publisher.py (+4/-4)
tests/unit/test_script_revert.py (+0/-8)
tests/unit/test_silomanager.py (+6/-97)
Robert Bruce Park (robru)
on 2015-10-23
| description: | updated |
Robert Bruce Park (robru)
on 2015-11-18
| Changed in cupstream2distro: | |
| status: | Fix Committed → Fix Released |
To post a comment you must log in.
Fix committed into lp:cupstream2distro at revision None, scheduled for release in cupstream2distro, milestone Unknown