--- a/mercurial/hg.py	Sat Jul 02 15:34:23 2005 -0800
+++ b/mercurial/hg.py	Sat Jul 02 15:38:16 2005 -0800
@@ -1255,6 +1255,9 @@
         for f in remove:
             self.ui.note("removing %s\n" % f)
             os.unlink(f)
+            # try removing directories that might now be empty
+            try: os.removedirs(os.path.dirname(f))
+            except: pass
         if mode == 'n':
             self.dirstate.forget(remove)
         else:

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-empty-dir	Sat Jul 02 15:38:16 2005 -0800
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+hg init
+echo 123 > a
+hg add a
+hg commit -t "first" -u test -d "0 0" a
+mkdir sub
+echo 321 > sub/b
+hg add sub/b
+hg commit -t "second" -u test -d "0 0" sub/b
+cat sub/b
+hg co 0
+cat sub/b
+ls sub
+
+true

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-empty-dir.out	Sat Jul 02 15:38:16 2005 -0800
@@ -0,0 +1,3 @@
+321
+cat: sub/b: No such file or directory
+ls: sub: No such file or directory