Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/merge.py @ 3098:fe9b13e35e46
Merge with crew
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 15 Sep 2006 15:22:45 -0500 |
parents | 1b738357bba9 db3f42261452 |
children | ef4e5d05bac4 |
line wrap: on
line diff
--- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -8,7 +8,7 @@ from node import * from i18n import gettext as _ from demandload import * -demandload(globals(), "util os tempfile") +demandload(globals(), "errno util os tempfile") def fmerge(f, local, other, ancestor): """merge executable flags""" @@ -166,7 +166,8 @@ def update(repo, node, branchmerge=False repo.ui.debug(_(" updating permissions for %s\n") % f) util.set_exec(repo.wjoin(f), m2.execf(f)) else: - if fmerge(f, m1, m2, ma) != m1.execf(f): + mode = fmerge(f, m1, m2, ma) + if mode != m1.execf(f): repo.ui.debug(_(" updating permissions for %s\n") % f) util.set_exec(repo.wjoin(f), mode)