Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
authorMatt Mackall <mpm@selenic.com>
Tue, 20 Jul 2010 15:07:10 -0500
changeset 11630 0c23085f051f
parent 11627 04f76a954842 (current diff)
parent 11629 9e874ee0fe97 (diff)
child 11631 dbb98d8fbcaf
Merge with stable
hgext/inotify/client.py file | annotate | diff | comparison | revisions
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- 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]
--- 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):
Mercurial