Allow people to uncommit new commits.

Bug #1509250 reported by Robert Bruce Park on 2015-10-23
6
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

description: updated
PS Jenkins bot (ps-jenkins) wrote :

Fix committed into lp:cupstream2distro at revision None, scheduled for release in cupstream2distro, milestone Unknown

Changed in cupstream2distro:
status: Triaged → Fix Committed
Changed in cupstream2distro:
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers