changeset 35123 | 7a58608281dd |
parent 35107 | b22a0d9e0a83 |
child 35147 | 3da4bd50103d |
--- a/mercurial/cmdutil.py Fri Nov 03 17:19:56 2017 -0400 +++ b/mercurial/cmdutil.py Fri Nov 17 22:52:40 2017 +0000 @@ -2982,8 +2982,9 @@ for f in remaining: count += 1 ui.progress(_('skipping'), count, total=total, unit=_('files')) - warnings.append(_('not removing %s: file still exists\n') - % m.rel(f)) + if ui.verbose or (f in files): + warnings.append(_('not removing %s: file still exists\n') + % m.rel(f)) ret = 1 ui.progress(_('skipping'), None) else: