Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 3706:0d810798acb1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use 'bundletype' instead of 'type' to not shadow built-in function.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 22 Nov 2006 22:33:57 +0100
parents 9c1737a3e254
children 67f44b825784
line wrap: on
line diff
--- a/mercurial/commands.py	Wed Nov 22 22:32:23 2006 +0100
+++ b/mercurial/commands.py	Wed Nov 22 22:33:57 2006 +0100
@@ -1324,8 +1324,8 @@
         if fname or not other.local():
             # create a bundle (uncompressed if other repo is not local)
             cg = other.changegroup(incoming, "incoming")
-            type = other.local() and "HG10BZ" or "HG10UN"
-            fname = cleanup = changegroup.writebundle(cg, fname, type)
+            bundletype = other.local() and "HG10BZ" or "HG10UN"
+            fname = cleanup = changegroup.writebundle(cg, fname, bundletype)
             # keep written bundle?
             if opts["bundle"]:
                 cleanup = None