--- a/mercurial/patch.py	Thu Jun 28 21:24:47 2018 +0530
+++ b/mercurial/patch.py	Thu Jun 28 18:07:22 2018 -0700
@@ -497,7 +497,8 @@
                 self.opener.setflags(fname, False, True)
 
     def unlink(self, fname):
-        self.opener.unlinkpath(fname, ignoremissing=True)
+        rmdir = self.ui.configbool('experimental', 'removeemptydirs')
+        self.opener.unlinkpath(fname, ignoremissing=True, rmdir=rmdir)
 
     def writerej(self, fname, failed, total, lines):
         fname = fname + ".rej"