# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1279656430 18000
# Node ID 0c23085f051f9bed8af35769c2fb5bbe7340cec2
# Parent  04f76a95484257cfa02a5044d6f78e818cd03aac# Parent  9e874ee0fe97ffd00fe13300f4cdf6b44921e71d
Merge with stable

diff -r 04f76a954842 -r 0c23085f051f hgext/inotify/client.py
--- a/hgext/inotify/client.py	Tue Jul 20 20:52:23 2010 +0200
+++ b/hgext/inotify/client.py	Tue Jul 20 15:07:10 2010 -0500
@@ -154,7 +154,7 @@
                 if names:
                     return filter(match, names.split('\0'))
             return []
-        results = map(readnames, resphdr[:-1])
+        results = tuple(map(readnames, resphdr[:-1]))
 
         if names:
             nbytes = resphdr[-1]
diff -r 04f76a954842 -r 0c23085f051f mercurial/commands.py
--- a/mercurial/commands.py	Tue Jul 20 20:52:23 2010 +0200
+++ b/mercurial/commands.py	Tue Jul 20 15:07:10 2010 -0500
@@ -3157,7 +3157,7 @@
                     ui.note(_('saving current version of %s as %s\n') %
                             (rel, bakname))
                     if not opts.get('dry_run'):
-                        util.copyfile(target, bakname)
+                        util.rename(target, bakname)
                 if ui.verbose or not exact:
                     msg = xlist[1]
                     if not isinstance(msg, basestring):