Mercurial > hg-stable

changeset 934:ff484cc157d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix path handling for deleting files on merge
author mpm@selenic.com
date Wed, 17 Aug 2005 00:36:36 -0800
parents 9c43d68ad59f
children 925563ff1b18 41ca6bf19735
files mercurial/hg.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hg.py	Wed Aug 17 00:33:53 2005 -0800
+++ b/mercurial/hg.py	Wed Aug 17 00:36:36 2005 -0800
@@ -1765,11 +1765,11 @@
         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':