Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • thg thg
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 839
    • Issues 839
    • List
    • Boards
    • Service Desk
    • Milestones
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Container Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • mercurialmercurial
  • TortoiseHgTortoiseHg
  • thgthg
  • Issues
  • #5292
Closed
Open
Issue created Dec 10, 2018 by Bitbucket Importer@bitbucket_importerOwner

Traceback error while attempting to merge

Created originally on Bitbucket by DaveInCaz (David Hollman)

I am getting this error when trying to do a merge. I don't know if there is anything special about this merge causing the problem, or if any merge would do this.

Steps:

  • I started with a clean working folder having used hg shelve first.

  • Click Merge toolbar button

  • Click the revision to merge with

  • Click the [Merge] button

  • Click [Next] on Prepare to Merge screen

  • Instantly get the error

#!python

    #!python
    ** Mercurial version (4.8).  TortoiseHg version (4.8)
    ** Command: 
    ** CWD: C:\Program Files\TortoiseHg
    ** Encoding: cp1252
    ** Extensions loaded: convert, graphlog, eol, strip, transplant, rebase, relink, extdiff, share, shelve, tortoisehg.util.configitems
    ** Python version: 2.7.13 (v2.7.13:a06454b1afa1, Dec 17 2016, 20:53:40) [MSC v.1500 64 bit (AMD64)]
    ** Windows version: sys.getwindowsversion(major=6, minor=2, build=9200, platform=2, service_pack='')
    ** Processor architecture: x64
    ** Qt-5.9.2 PyQt-5.9.1 QScintilla-2.10.2.dev1711012104
    Traceback (most recent call last):
      File "tortoisehg\hgqt\merge.pyo", line 113, in pageChanged
      File "tortoisehg\hgqt\merge.pyo", line 368, in currentPage
    TypeError: %d format: a number is required, not NoneType

Thanks

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information
Assignee
Assign to
Time tracking