Show More
@@ -8,7 +8,7 b'' | |||||
8 | from node import * |
|
8 | from node import * | |
9 | from i18n import gettext as _ |
|
9 | from i18n import gettext as _ | |
10 | from demandload import * |
|
10 | from demandload import * | |
11 | demandload(globals(), "util os tempfile") |
|
11 | demandload(globals(), "errno util os tempfile") | |
12 |
|
12 | |||
13 | def fmerge(f, local, other, ancestor): |
|
13 | def fmerge(f, local, other, ancestor): | |
14 | """merge executable flags""" |
|
14 | """merge executable flags""" | |
@@ -168,7 +168,8 b' def update(repo, node, branchmerge=False' | |||||
168 | repo.ui.debug(_(" updating permissions for %s\n") % f) |
|
168 | repo.ui.debug(_(" updating permissions for %s\n") % f) | |
169 | util.set_exec(repo.wjoin(f), m2.execf(f)) |
|
169 | util.set_exec(repo.wjoin(f), m2.execf(f)) | |
170 | else: |
|
170 | else: | |
171 |
|
|
171 | mode = fmerge(f, m1, m2, ma) | |
|
172 | if mode != m1.execf(f): | |||
172 | repo.ui.debug(_(" updating permissions for %s\n") |
|
173 | repo.ui.debug(_(" updating permissions for %s\n") | |
173 | % f) |
|
174 | % f) | |
174 | util.set_exec(repo.wjoin(f), mode) |
|
175 | util.set_exec(repo.wjoin(f), mode) |
General Comments 0
You need to be logged in to leave comments.
Login now