[obs-commits] [openSUSE/osc] 45e27c: Correctly update a conflict file ('C') that is goi...

Branch: refs/heads/master Home: https://github.com/openSUSE/osc Commit: 45e27c01af65f67d12d598199b405be9b1308504 https://github.com/openSUSE/osc/commit/45e27c01af65f67d12d598199b405be9b1308... Author: Marcus Huewe Date: 2017-03-20 (Mon, 20 Mar 2017) Changed paths: M osc/core.py Log Message: ----------- Correctly update a conflict file ('C') that is going to be deleted Deleting a conflict file (state 'C') during an update operation results in an inconsistent working copy. To fix this, we remove the conflict file from the _in_conflict list.