hgext/histedit.py

42980:e3bb2a58af1e

        try:
            mergemod.calculateupdates(
                repo, wctx, c, ancs,
                # These parameters were determined by print-debugging
                # what happens later on inside histedit.
                False, # branchmerge
                False, # force
                False, # acceptremote
                False, # followcopies
            )
        except error.Abort:
            raise error.Abort(
       _("untracked files in working directory conflict with files in %s") % (
           c))

42981:b4093d1d3b18

        try:
            mergemod.calculateupdates(
                repo, wctx, c, ancs,
                # These parameters were determined by print-debugging
                # what happens later on inside histedit.
                branchmerge=False, force=False, acceptremote=False,
                followcopies=False)
        except error.Abort:
            raise error.Abort(
       _("untracked files in working directory conflict with files in %s") % (
           c))