# HG changeset patch
# User mpm@selenic.com
# Date 1124267796 28800
# Node ID ff484cc157d67d254e2d269ba4514f4187e47998
# Parent  9c43d68ad59f040395c9d188e0fb7080cfc60b74
Fix path handling for deleting files on merge



diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -1765,11 +1765,11 @@ class localrepository:
         for f in remove:
             self.ui.note("removing %s\n" % f)
             try:
-                os.unlink(f)
+                os.unlink(self.wjoin(f))
             except OSError, inst:
                 self.ui.warn("update failed to remove %s: %s!\n" % (f, inst))
             # try removing directories that might now be empty
-            try: os.removedirs(os.path.dirname(f))
+            try: os.removedirs(os.path.dirname(self.wjoin(f)))
             except: pass
         if moddirstate:
             if mode == 'n':