##// END OF EJS Templates
graft: remark on empty graft
Matt Mackall -
r16600:b54f3c50 default
parent child Browse files
Show More
@@ -2719,8 +2719,10 b' def graft(ui, repo, *revs, **opts):'
2719 date = ctx.date()
2719 date = ctx.date()
2720 if opts.get('date'):
2720 if opts.get('date'):
2721 date = opts['date']
2721 date = opts['date']
2722 repo.commit(text=ctx.description(), user=user,
2722 node = repo.commit(text=ctx.description(), user=user,
2723 date=date, extra=extra, editor=editor)
2723 date=date, extra=extra, editor=editor)
2724 if node is None:
2725 ui.status(_('graft for revision %s is empty\n') % ctx.rev())
2724 finally:
2726 finally:
2725 wlock.release()
2727 wlock.release()
2726
2728
@@ -132,6 +132,7 b' Graft out of order, skipping a merge and'
132 b: local copied/moved to a -> m
132 b: local copied/moved to a -> m
133 preserving b for resolve of b
133 preserving b for resolve of b
134 updating: b 1/1 files (100.00%)
134 updating: b 1/1 files (100.00%)
135 graft for revision 1 is empty
135 grafting revision 5
136 grafting revision 5
136 searching for copies back to rev 1
137 searching for copies back to rev 1
137 resolving manifests
138 resolving manifests
General Comments 0
You need to be logged in to leave comments. Login now