1696     try:

  1696     try:

  1697         # premerge

  1697         # premerge

  1698         tocomplete = []

  1698         tocomplete = []

  1699         for f, args, msg in mergeactions:

  1699         for f, args, msg in mergeactions:

  1700             repo.ui.debug(b" %s: %s -> m (premerge)\n" % (f, msg))

  1700             repo.ui.debug(b" %s: %s -> m (premerge)\n" % (f, msg))

  1701             progress.increment(item=f)

  1702             progress.increment(item=f)

  1702             if f == b'.hgsubstate':  # subrepo states need updating

  1703             if f == b'.hgsubstate':  # subrepo states need updating

  1703                 subrepoutil.submerge(

  1704                 subrepoutil.submerge(

  1704                     repo, wctx, mctx, wctx.ancestor(mctx), overwrite, labels

  1705                     repo, wctx, mctx, wctx.ancestor(mctx), overwrite, labels

  1705                 )

  1706                 )

  1711                 tocomplete.append((f, args, msg))

  1712                 tocomplete.append((f, args, msg))

  1712 

  1713 

  1713         # merge

  1714         # merge

  1714         for f, args, msg in tocomplete:

  1715         for f, args, msg in tocomplete:

  1715             repo.ui.debug(b" %s: %s -> m (merge)\n" % (f, msg))

  1716             repo.ui.debug(b" %s: %s -> m (merge)\n" % (f, msg))

  1716             progress.increment(item=f, total=numupdates)

  1718             progress.increment(item=f, total=numupdates)

  1717             ms.resolve(f, wctx)

  1719             ms.resolve(f, wctx)

  1718 

  1720 

  1719     finally:

  1721     finally:

  1720         ms.commit()

  1722         ms.commit()