--- a/mercurial/commands.py	Tue Apr 24 12:02:51 2007 -0700
+++ b/mercurial/commands.py	Tue Apr 24 18:43:18 2007 -0700
@@ -503,7 +503,7 @@
                      util.localpath(prevsrc)))
             return
         if (not opts['after'] and os.path.exists(reltarget) or
-            opts['after'] and repo.dirstate.state(abstarget) not in '?r'):
+            opts['after'] and repo.dirstate.state(abstarget) not in '?ar'):
             if not opts['force']:
                 ui.warn(_('%s: not overwriting - file exists\n') %
                         reltarget)