http://bugzilla.novell.com/show_bug.cgi?id=507367
User jw@novell.com added comment
http://bugzilla.novell.com/show_bug.cgi?id=507367#c2
Juergen Weigert changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|RESOLVED |REOPENED
CC| |jw@novell.com
Resolution|FIXED |
--- Comment #2 from Juergen Weigert 2009-08-17 10:51:02 MDT ---
The fix appears incorrect.
osc repairlink; vi ... ; osc resolved ..; osc ci
now fails with
if have_conflicts or self.islinkrepair():
print 'Please resolve all conflicts before committing using "osc
resolved FILE"!'
return 1
Maybe a simple
if have_conflicts:
is better?
--
Configure bugmail: http://bugzilla.novell.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.