From 10f4a6240da2a2e4723624fa435585ab98ecb6e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Wed, 28 Jul 2010 12:13:46 +0200
Subject: [PATCH] remove a file from conflict list in any case, when it gets
 removed

---
 osc/commandline.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osc/commandline.py b/osc/commandline.py
index de372871..230abd6d 100644
--- a/osc/commandline.py
+++ b/osc/commandline.py
@@ -3100,6 +3100,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
             else:
                 pathn = getTransActPath(p.dir)
                 for filename in p.todo:
+                    p.clear_from_conflictlist(filename)
                     ret, state = p.delete_file(filename, opts.force)
                     if ret:
                         print statfrmt('D', os.path.join(pathn, filename))