From eaa08653e0217e9f1c264bedf85a3fec549d9c8c Mon Sep 17 00:00:00 2001 From: "Dr. Peter Poeml" Date: Fri, 6 Jul 2007 11:20:30 +0000 Subject: [PATCH] addremove: ignore foo.rXX, foo.mine for files which are in 'C' state --- osc/commandline.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/osc/commandline.py b/osc/commandline.py index 8c36d949..7f9f546c 100755 --- a/osc/commandline.py +++ b/osc/commandline.py @@ -684,6 +684,9 @@ class Osc(cmdln.Cmdln): for filename in p.todo: if os.path.isdir(filename): continue + # ignore foo.rXX, foo.mine for files which are in 'C' state + if os.path.splitext(filename)[0] in p.in_conflict: + continue state = p.status(filename) if state == '?': p.addfile(filename)