Show More
@@ -123,8 +123,7 b' def update(repo, node, branchmerge=False' | |||||
123 | m1.set(f, util.is_exec(repo.wjoin(f), m1.execf(f))) |
|
123 | m1.set(f, util.is_exec(repo.wjoin(f), m1.execf(f))) | |
124 |
|
124 | |||
125 | for f in deleted + removed: |
|
125 | for f in deleted + removed: | |
126 |
|
|
126 | del m1[f] | |
127 | del m1[f] |
|
|||
128 |
|
127 | |||
129 | # If we're jumping between revisions (as opposed to merging), |
|
128 | # If we're jumping between revisions (as opposed to merging), | |
130 | # and if neither the working directory nor the target rev has |
|
129 | # and if neither the working directory nor the target rev has |
General Comments 0
You need to be logged in to leave comments.
Login now