Mercurial > public > mercurial-scm > hg
diff mercurial/commands.py @ 16600:b54f3c502e63
graft: remark on empty graft
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 06 May 2012 14:15:17 -0500 |
parents | 46e9ed223d2c |
children | ddd4996740c7 |
line wrap: on
line diff
--- a/mercurial/commands.py Fri May 04 17:27:14 2012 -0500 +++ b/mercurial/commands.py Sun May 06 14:15:17 2012 -0500 @@ -2719,8 +2719,10 @@ date = ctx.date() if opts.get('date'): date = opts['date'] - repo.commit(text=ctx.description(), user=user, + node = repo.commit(text=ctx.description(), user=user, date=date, extra=extra, editor=editor) + if node is None: + ui.status(_('graft for revision %s is empty\n') % ctx.rev()) finally: wlock.release()