equal
deleted
inserted
replaced
56 repo.ui.warn(_("merging %s failed!\n") % fw) |
56 repo.ui.warn(_("merging %s failed!\n") % fw) |
57 |
57 |
58 os.unlink(b) |
58 os.unlink(b) |
59 os.unlink(c) |
59 os.unlink(c) |
60 return r |
60 return r |
61 |
|
62 def merge3(repo, fn, my, other, p1, p2): |
|
63 """perform a 3-way merge in the working directory""" |
|
64 return filemerge(repo, fn, fn, fn, my, other, p1, p2, False) |
|
65 |
61 |
66 def checkunknown(repo, m2, status): |
62 def checkunknown(repo, m2, status): |
67 """ |
63 """ |
68 check for collisions between unknown files and files in m2 |
64 check for collisions between unknown files and files in m2 |
69 """ |
65 """ |
275 (f, inst.strerror)) |
271 (f, inst.strerror)) |
276 removed +=1 |
272 removed +=1 |
277 elif m == "m": # merge |
273 elif m == "m": # merge |
278 flag, my, other = a[2:] |
274 flag, my, other = a[2:] |
279 repo.ui.status(_("merging %s\n") % f) |
275 repo.ui.status(_("merging %s\n") % f) |
280 if merge3(repo, f, my, other, xp1, xp2): |
276 if filemerge(repo, f, f, f, my, other, xp1, xp2, False): |
281 unresolved += 1 |
277 unresolved += 1 |
282 util.set_exec(repo.wjoin(f), flag) |
278 util.set_exec(repo.wjoin(f), flag) |
283 merged += 1 |
279 merged += 1 |
284 elif m == "g": # get |
280 elif m == "g": # get |
285 flag, node = a[2:] |
281 flag, node = a[2:] |