Show More
@@ -439,7 +439,7 b' def recordupdates(repo, action, branchme' | |||||
439 | if f: |
|
439 | if f: | |
440 | repo.dirstate.forget(f) |
|
440 | repo.dirstate.forget(f) | |
441 |
|
441 | |||
442 | def update(repo, node, branchmerge, force, partial): |
|
442 | def update(repo, node, branchmerge, force, partial, ancestor=None): | |
443 | """ |
|
443 | """ | |
444 | Perform a merge between the working directory and the given node |
|
444 | Perform a merge between the working directory and the given node | |
445 |
|
445 | |||
@@ -492,7 +492,11 b' def update(repo, node, branchmerge, forc' | |||||
492 | overwrite = force and not branchmerge |
|
492 | overwrite = force and not branchmerge | |
493 | pl = wc.parents() |
|
493 | pl = wc.parents() | |
494 | p1, p2 = pl[0], repo[node] |
|
494 | p1, p2 = pl[0], repo[node] | |
495 |
|
|
495 | if ancestor: | |
|
496 | pa = repo[ancestor] | |||
|
497 | else: | |||
|
498 | pa = p1.ancestor(p2) | |||
|
499 | ||||
496 | fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2) |
|
500 | fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2) | |
497 |
|
501 | |||
498 | ### check phase |
|
502 | ### check phase |
General Comments 0
You need to be logged in to leave comments.
Login now