summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pym/repoman/utilities.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/pym/repoman/utilities.py b/pym/repoman/utilities.py
index a07b4a436..acecd7982 100644
--- a/pym/repoman/utilities.py
+++ b/pym/repoman/utilities.py
@@ -73,6 +73,9 @@ def detect_vcs_conflicts(options, vcs):
if not line:
continue
if line[0] not in "UPMARD": # Updates,Patches,Modified,Added,Removed/Replaced(svn),Deleted(svn)
+ # Stray Manifest is fine, we will readd it anyway.
+ if line[0] == '?' and line[1:].lstrip() == 'Manifest':
+ continue
logging.error(red("!!! Please fix the following issues reported " + \
"from cvs: ")+green("(U,P,M,A,R,D are ok)"))
logging.error(red("!!! Note: This is a pretend/no-modify pass..."))