merge from crew-stable
authorDirkjan Ochtman <dirkjan@ochtman.nl>
Thu, 24 Apr 2008 17:15:55 +0200
changeset 6567 24dbf3a32b18
parent 6565 a0a726909871 (current diff)
parent 6566 30d3d531e11a (diff)
child 6568 0c4c804c8261
merge from crew-stable
--- a/mercurial/cmdutil.py	Thu Apr 24 13:37:29 2008 +0200
+++ b/mercurial/cmdutil.py	Thu Apr 24 17:15:55 2008 +0200
@@ -395,7 +395,7 @@
                 repo.copy(origsrc, abstarget)
 
         if rename and not dryrun:
-            repo.remove([abssrc], True)
+            repo.remove([abssrc], not after)
 
     # pat: ossep
     # dest ossep