- if revid != awaitedrevid :
- print "Ignoring %s - Edition conflict detected %s - %s " % ( file , awaitedrevid, revid)
+ if revid != awaitedrevid:
+ print "warning: edit conflict detected on %s (%s -> %s) " \
+ "-- skipping!" % (file , awaitedrevid, revid)