Show More
@@ -155,7 +155,7 b' def update(repo, node, branchmerge=False' | |||
|
155 | 155 | if n != m2[f]: |
|
156 | 156 | a = ma.get(f, nullid) |
|
157 | 157 | # are both different from the ancestor? |
|
158 | if n != a and m2[f] != a: | |
|
158 | if not overwrite and n != a and m2[f] != a: | |
|
159 | 159 | repo.ui.debug(_(" %s versions differ, resolve\n") % f) |
|
160 | 160 | merge[f] = (fmerge(f, mw, m2, ma), m1.get(f, nullid), m2[f]) |
|
161 | 161 | queued = 1 |
@@ -233,11 +233,6 b' def update(repo, node, branchmerge=False' | |||
|
233 | 233 | |
|
234 | 234 | ### apply phase |
|
235 | 235 | |
|
236 | if overwrite: | |
|
237 | for f in merge: | |
|
238 | get[f] = merge[f][:2] | |
|
239 | merge = {} | |
|
240 | ||
|
241 | 236 | if linear_path or overwrite: |
|
242 | 237 | # we don't need to do any magic, just jump to the new rev |
|
243 | 238 | p1, p2 = p2, nullid |
General Comments 0
You need to be logged in to leave comments.
Login now