Mercurial > hg-stable
changeset 16600:b54f3c502e63
graft: remark on empty graft
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 06 May 2012 14:15:17 -0500 |
| parents | 4b73f4ba27ca |
| children | 0c98820be15c |
| files | mercurial/commands.py tests/test-graft.t |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
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()
--- a/tests/test-graft.t Fri May 04 17:27:14 2012 -0500 +++ b/tests/test-graft.t Sun May 06 14:15:17 2012 -0500 @@ -132,6 +132,7 @@ b: local copied/moved to a -> m preserving b for resolve of b updating: b 1/1 files (100.00%) + graft for revision 1 is empty grafting revision 5 searching for copies back to rev 1 resolving manifests