Show More
@@ -1479,7 +1479,7 b' def recordupdates(repo, actions, branchm' | |||||
1479 |
|
1479 | |||
1480 | def update(repo, node, branchmerge, force, ancestor=None, |
|
1480 | def update(repo, node, branchmerge, force, ancestor=None, | |
1481 | mergeancestor=False, labels=None, matcher=None, mergeforce=False, |
|
1481 | mergeancestor=False, labels=None, matcher=None, mergeforce=False, | |
1482 | updatecheck=None): |
|
1482 | updatecheck=None, wc=None): | |
1483 | """ |
|
1483 | """ | |
1484 | Perform a merge between the working directory and the given node |
|
1484 | Perform a merge between the working directory and the given node | |
1485 |
|
1485 | |||
@@ -1527,6 +1527,9 b' def update(repo, node, branchmerge, forc' | |||||
1527 | 2 = abort: uncommitted changes (commit or update --clean to discard changes) |
|
1527 | 2 = abort: uncommitted changes (commit or update --clean to discard changes) | |
1528 | 3 = abort: uncommitted changes (checked in commands.py) |
|
1528 | 3 = abort: uncommitted changes (checked in commands.py) | |
1529 |
|
1529 | |||
|
1530 | The merge is performed inside ``wc``, a workingctx-like objects. It defaults | |||
|
1531 | to repo[None] if None is passed. | |||
|
1532 | ||||
1530 | Return the same tuple as applyupdates(). |
|
1533 | Return the same tuple as applyupdates(). | |
1531 | """ |
|
1534 | """ | |
1532 | # Avoid cycle. |
|
1535 | # Avoid cycle. | |
@@ -1550,7 +1553,8 b' def update(repo, node, branchmerge, forc' | |||||
1550 | else: |
|
1553 | else: | |
1551 | partial = True |
|
1554 | partial = True | |
1552 | with repo.wlock(): |
|
1555 | with repo.wlock(): | |
1553 |
wc |
|
1556 | if wc is None: | |
|
1557 | wc = repo[None] | |||
1554 | pl = wc.parents() |
|
1558 | pl = wc.parents() | |
1555 | p1 = pl[0] |
|
1559 | p1 = pl[0] | |
1556 | pas = [None] |
|
1560 | pas = [None] |
General Comments 0
You need to be logged in to leave comments.
Login now