Show More
@@ -1092,9 +1092,12 b' class localrepository:' | |||||
1092 | # construct a working dir manifest |
|
1092 | # construct a working dir manifest | |
1093 | mw = m1.copy() |
|
1093 | mw = m1.copy() | |
1094 | mfw = mf1.copy() |
|
1094 | mfw = mf1.copy() | |
|
1095 | umap = dict.fromkeys(u) | |||
|
1096 | ||||
1095 | for f in a + c + u: |
|
1097 | for f in a + c + u: | |
1096 | mw[f] = "" |
|
1098 | mw[f] = "" | |
1097 | mfw[f] = util.is_exec(self.wjoin(f), mfw.get(f, False)) |
|
1099 | mfw[f] = util.is_exec(self.wjoin(f), mfw.get(f, False)) | |
|
1100 | ||||
1098 | for f in d: |
|
1101 | for f in d: | |
1099 | if f in mw: del mw[f] |
|
1102 | if f in mw: del mw[f] | |
1100 |
|
1103 | |||
@@ -1106,6 +1109,7 b' class localrepository:' | |||||
1106 | if linear_path and f not in m2: |
|
1109 | if linear_path and f not in m2: | |
1107 | self.dirstate.forget((f,)) |
|
1110 | self.dirstate.forget((f,)) | |
1108 |
|
1111 | |||
|
1112 | # Compare manifests | |||
1109 | for f, n in mw.iteritems(): |
|
1113 | for f, n in mw.iteritems(): | |
1110 | if f in m2: |
|
1114 | if f in m2: | |
1111 | s = 0 |
|
1115 | s = 0 | |
@@ -1140,6 +1144,9 b' class localrepository:' | |||||
1140 | s = 1 |
|
1144 | s = 1 | |
1141 | else: |
|
1145 | else: | |
1142 | mark[f] = 1 |
|
1146 | mark[f] = 1 | |
|
1147 | elif f in umap: | |||
|
1148 | # this unknown file is the same as the checkout | |||
|
1149 | get[f] = m2[f] | |||
1143 |
|
1150 | |||
1144 | if not s and mfw[f] != mf2[f]: |
|
1151 | if not s and mfw[f] != mf2[f]: | |
1145 | if force: |
|
1152 | if force: |
General Comments 0
You need to be logged in to leave comments.
Login now