Mercurial > public > mercurial-scm > hg
diff mercurial/merge.py @ 22200:b27c3beaaf30
cleanup: avoid local vars shadowing imports
This will mute some pyflakes "import ... shadowed by loop variable" warnings.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Fri, 15 Aug 2014 16:20:47 +0200 |
| parents | bde505f47141 |
| children | 8dda6f6ff564 |
line wrap: on
line diff
--- a/mercurial/merge.py Fri Aug 15 16:20:47 2014 +0200 +++ b/mercurial/merge.py Fri Aug 15 16:20:47 2014 +0200 @@ -10,7 +10,7 @@ from node import nullid, nullrev, hex, bin from i18n import _ from mercurial import obsolete -import error, util, filemerge, copies, subrepo, worker, dicthelpers +import error as errormod, util, filemerge, copies, subrepo, worker, dicthelpers import errno, os, shutil _pack = struct.pack @@ -1011,7 +1011,7 @@ # but currently we are only checking the branch tips. try: node = repo.branchtip(wc.branch()) - except error.RepoLookupError: + except errormod.RepoLookupError: if wc.branch() == "default": # no default branch! node = repo.lookup("tip") # update to tip else: