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
  • #5217
Closed
Open
Created Sep 14, 2018 by Matt Harbison@mharbison72Owner

Refresh error dialog when pruning '.' and amend is selected in commit widget in 4.6.1

I amended the tip of a series last night, and pulled the hg-committed result this morning. The first three commits obsoleted, and I pruned the orphan in thg. I didn't realize I had left the commit widget with 'amend' still selected, and after a few seconds, got a message saying "filtered revision ''". There's no stacktrace or other error in the log window, and --nofork --debug doesn't seem to have anything useful.

...
locked, aborting
locked, aborting
 stat: D:\mercurial\.hg\branch ((8L, 1536934998.8368795, 1536934998.8378775) -> (8L, 1536935112.8868291, 1536935112.8868291))
 stat: D:\mercurial\.hg\dirstate ((79245L, 1536934999.5359898, 1536934999.539951) -> (79245L, 1536935112.9068289, 1536935112.9068289))
 stat: D:\mercurial\.hg/store\obsstore ((17962530L, 1526304044.0672638, 1536934981.0) -> (17962656L, 1526304044.0672638, 1536935112.8868291))
 data: _readparents ("!\xb7\x87=b2'7\xc5\x85\r\x07\x16/\xe8\xfd\xaf\x98\xfb\xf5\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" -> '\xc5\xe6\xc1\xba\x1cy\xffw\x1b\xac\xaf\xa0\'\x06\xff\x06"X\xc30\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
change found (flags = 0xb)
invalid branchheads cache (visible): tip differs
invalid branchheads cache (served): tip differs
lfs: assuming remote store: https://www.mercurial-scm.org/repo/hg//.git/info/lfs
 stat: D:\mercurial\.hg\dirstate ((79245L, 1536935112.9068289, 1536935112.9068289) -> (79245L, 1536935113.576829, 1536935113.576829))
change found (flags = 0x8)
GarbageCollector.check: 10063 1 9
collected gen 0, found 2848 unreachable
stopping service: D:\mercurial
closing repo: D:\mercurial
restoring excepthook

Unlike some other strange behaviors with amend and evolve that I still need to nail down, this one doesn't seem stateful. I can rollback and re-prune from the command line, and open and close thg, and reproduce it on demand. It doesn't seem to be an issue if 'commit' is active instead of 'amend'.

thg small prune error.png

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