Skip to content
GitLab
  • Menu
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 829
    • Issues 829
    • List
    • Boards
    • Service Desk
    • Milestones
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages & Registries
    • Packages & 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
  • mercurial
  • TortoiseHg
  • thgthg
  • Issues
  • #4352
Closed
Open
Created Nov 11, 2015 by Bitbucket Importer@bitbucket_importerOwner

shelve: uncommitted merge with no revision specified

Created originally on Bitbucket by Anonymous

I was merging two branches, but have not committed the merge yet. I need to revert some of the changes.

In the shelf tool, I tried to delete all the changed chunks.

I was asked if I wanted to revert the file, I agreed, and got this error:

#!python
** Mercurial version (3.6+20151109).  TortoiseHg version (3.6)
** Command: --nofork workbench
** CWD: D:\repos\auto-importer
** Encoding: cp1256
** Extensions loaded: rebase, convert, strip, mq
** Python version: 2.7.9 (default, Dec 10 2014, 12:28:03) [MSC v.1500 64 bit (AMD64)]
** Windows version: sys.getwindowsversion(major=6, minor=1, build=7601, platform=2, service_pack='Service Pack 1')
** Processor architecture: x64
** Qt-4.8.6 PyQt-4.11.3 QScintilla-2.8.4
Traceback (most recent call last):
  File "tortoisehg\hgqt\shelve.pyo", line 262, in deleteChunksA
  File "tortoisehg\hgqt\chunks.pyo", line 283, in deleteSelectedChunks
  File "mercurial\commands.pyo", line 5772, in revert
Abort: uncommitted merge with no revision specified
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information
Assignee
Assign to
Time tracking