Show More
@@ -203,8 +203,6 b' def update(repo, node, branchmerge=False' | |||||
203 | action = [] |
|
203 | action = [] | |
204 |
|
204 | |||
205 | # update m1 from working dir |
|
205 | # update m1 from working dir | |
206 | umap = dict.fromkeys(unknown) |
|
|||
207 |
|
||||
208 | for i,l in (("a", added), ("m", modified), ("u", unknown)): |
|
206 | for i,l in (("a", added), ("m", modified), ("u", unknown)): | |
209 | for f in l: |
|
207 | for f in l: | |
210 | m1[f] = m1.get(f, nullid) + i |
|
208 | m1[f] = m1.get(f, nullid) + i |
General Comments 0
You need to be logged in to leave comments.
Login now