Show More
@@ -120,8 +120,10 b' def update(repo, node, branchmerge=False' | |||||
120 | umap = dict.fromkeys(unknown) |
|
120 | umap = dict.fromkeys(unknown) | |
121 |
|
121 | |||
122 | for f in added + modified + unknown: |
|
122 | for f in added + modified + unknown: | |
123 | mw[f] = "" |
|
123 | mw[f] = nullid + "+" | |
124 | mw.set(f, util.is_exec(repo.wjoin(f), mw.execf(f))) |
|
124 | mw.set(f, util.is_exec(repo.wjoin(f), mw.execf(f))) | |
|
125 | if f in m1: | |||
|
126 | mw[f] = m1[f] + "+" | |||
125 |
|
127 | |||
126 | for f in deleted + removed: |
|
128 | for f in deleted + removed: | |
127 | if f in mw: |
|
129 | if f in mw: | |
@@ -152,12 +154,12 b' def update(repo, node, branchmerge=False' | |||||
152 | # are both different from the ancestor? |
|
154 | # are both different from the ancestor? | |
153 | if not overwrite and n != a and m2[f] != a: |
|
155 | if not overwrite and n != a and m2[f] != a: | |
154 | repo.ui.debug(_(" %s versions differ, resolve\n") % f) |
|
156 | repo.ui.debug(_(" %s versions differ, resolve\n") % f) | |
155 |
merge[f] = (fmerge(f, mw, m2, ma), |
|
157 | merge[f] = (fmerge(f, mw, m2, ma), n[:20], m2[f]) | |
156 | queued = 1 |
|
158 | queued = 1 | |
157 | # are we clobbering? |
|
159 | # are we clobbering? | |
158 | # is remote's version newer? |
|
160 | # is remote's version newer? | |
159 | # or are we going back in time and clean? |
|
161 | # or are we going back in time and clean? | |
160 |
elif overwrite or m2[f] != a or (backwards and |
|
162 | elif overwrite or m2[f] != a or (backwards and not n[20:]): | |
161 | repo.ui.debug(_(" remote %s is newer, get\n") % f) |
|
163 | repo.ui.debug(_(" remote %s is newer, get\n") % f) | |
162 | get[f] = (m2.execf(f), m2[f]) |
|
164 | get[f] = (m2.execf(f), m2[f]) | |
163 | queued = 1 |
|
165 | queued = 1 | |
@@ -194,7 +196,7 b' def update(repo, node, branchmerge=False' | |||||
194 | if overwrite and f not in umap: |
|
196 | if overwrite and f not in umap: | |
195 | repo.ui.debug(_("remote deleted %s, clobbering\n") % f) |
|
197 | repo.ui.debug(_("remote deleted %s, clobbering\n") % f) | |
196 | remove.append(f) |
|
198 | remove.append(f) | |
197 |
elif n |
|
199 | elif not n[20:]: # same as parent | |
198 | if backwards: |
|
200 | if backwards: | |
199 | repo.ui.debug(_("remote deleted %s\n") % f) |
|
201 | repo.ui.debug(_("remote deleted %s\n") % f) | |
200 | remove.append(f) |
|
202 | remove.append(f) |
General Comments 0
You need to be logged in to leave comments.
Login now