##// END OF EJS Templates
shelve: don't swallow errors that happen when reverting the working copy...
Martin von Zweigbergk -
r48229:6ecd0980 default
parent child Browse files
Show More
@@ -781,9 +781,7 b' def mergefiles(ui, repo, wctx, shelvectx'
781 dirstate."""
781 dirstate."""
782 with ui.configoverride({(b'ui', b'quiet'): True}):
782 with ui.configoverride({(b'ui', b'quiet'): True}):
783 hg.update(repo, wctx.node())
783 hg.update(repo, wctx.node())
784 ui.pushbuffer(True)
785 cmdutil.revert(ui, repo, shelvectx)
784 cmdutil.revert(ui, repo, shelvectx)
786 ui.popbuffer()
787
785
788
786
789 def restorebranch(ui, repo, branchtorestore):
787 def restorebranch(ui, repo, branchtorestore):
General Comments 0
You need to be logged in to leave comments. Login now