mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-12-30 19:56:14 +01:00
Code

extended error message on unresolved files to point people to "resolved"

Browse Source 
command.
This commit is contained in:
Adrian Schröter 2009-05-07 13:02:22 +00:00
parent e5563bcaa4
commit 5684a992dd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osc/core.py
View File

@ -740,7 +740,7 @@ class Package:
have_conflicts = True have_conflicts = True
if have_conflicts and self.islinkrepair(): if have_conflicts and self.islinkrepair():
print 'Please resolve all conflicts before committing!' print 'Please resolve all conflicts before committing using "osc resolved FILE"!'
return 1 return 1
if not self.todo_send and not self.todo_delete and not self.rev == "upload" and not self.islinkrepair(): if not self.todo_send and not self.todo_delete and not self.rev == "upload" and not self.islinkrepair():