From 4f8bedf9987623de323199039aee5a900093e353 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Thu, 17 Mar 2011 15:35:22 +0100
Subject: [PATCH] - do not try to merge generated _service: files on pull

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

diff --git a/osc/commandline.py b/osc/commandline.py
index d5651968..03e4addf 100644
--- a/osc/commandline.py
+++ b/osc/commandline.py
@@ -6246,6 +6246,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
         entries.update(entries_oldpatched)
         entries.update(entries_new)
         for name in sorted(entries.keys()):
+            if name.startswith('_service:') or name.startswith('_service_'):
+		continue
             md5_old = entries_old.get(name, '')
             md5_new = entries_new.get(name, '')
             md5_oldpatched = entries_oldpatched.get(name, '')