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 838
    • Issues 838
    • 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
  • #4636
Closed
Open
Issue created Dec 07, 2016 by Bitbucket Importer@bitbucket_importerOwner

Inconsistent terminology - "revert" vs. "discard"

Created originally on Bitbucket by DaveInCaz (David Hollman)

In some places in THG Workbench the "revert" function is called "revert" and in other places "discard". I think it would be less confusing if a single term were used as a standard.

I suggest "revert" is the better term since that is also the name of the hg command.

Specific places where I have noticed this:

[1] In Commit view, right click on a modified file. Shows "Revert" option. When you select that option, the dialog mixes both terms.

Capture.PNG

Suggest changing "Discard changes" to "Revert without Backup"

[2] Rebase window - says "... you must commit, shelve to patch, or discard..."

[3] Merge window - much the same as rebase

[4] Update window - checkbox "Discard local changes..."

[5] Context menu for a revision - "Revert All File..." option. The dialog then states "Reverting all files will discard changes...". Though this is OK since that is just providing a definition of 'revert', the Hg help for revert defines it as "restore files to their checkout state". Maybe using that definition would be more consistent.

There could be other cases, these are all I can think of right now.

Note - I've been introducing THG to several new users recently and these kinds of issues can be real points of confusion for them (when there is so much else to learn about THG / Hg, etc.)

Thanks

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