1512     2 = abort: uncommitted changes (commit or update --clean to discard changes)

  1512     2 = abort: uncommitted changes (commit or update --clean to discard changes)

  1513     3 = abort: uncommitted changes (checked in commands.py)

  1513     3 = abort: uncommitted changes (checked in commands.py)

  1514 

  1514 

  1515     Return the same tuple as applyupdates().

  1515     Return the same tuple as applyupdates().

  1516     """

  1516     """

  1517 

  1519 

  1518     # This function used to find the default destination if node was None, but

  1520     # This function used to find the default destination if node was None, but

  1519     # that's now in destutil.py.

  1521     # that's now in destutil.py.

  1520     assert node is not None

  1522     assert node is not None

  1521     if not branchmerge and not force:

  1523     if not branchmerge and not force:

  1701                 util.unlink(repo.vfs.join('updatestate'))

  1703                 util.unlink(repo.vfs.join('updatestate'))

  1702 

  1704 

  1703                 if not branchmerge:

  1705                 if not branchmerge:

  1704                     repo.dirstate.setbranch(p2.branch())

  1706                     repo.dirstate.setbranch(p2.branch())

  1705 

  1707 

  1706     if not partial:

  1713     if not partial:

  1707         repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3])

  1714         repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3])

  1708     return stats

  1715     return stats

  1709 

  1716 

  1710 def graft(repo, ctx, pctx, labels, keepparent=False):

  1717 def graft(repo, ctx, pctx, labels, keepparent=False):