Skip to content

GitLab

  • Menu
Projects Groups Snippets
    • Loading...
  • 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 835
    • Issues 835
    • List
    • Boards
    • Service Desk
    • Milestones
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Monitor
    • Monitor
    • Incidents
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar

This instance was upgraded to Heptapod 0.31.0 (final) today.

  • mercurial
  • TortoiseHg
  • thgthg
  • Issues
  • #5373

Closed
Open
Created Apr 01, 2019 by Bitbucket Importer@bitbucket_importerOwner

Regression: Shelve discards deleted files marked for removal

Created originally on Bitbucket by Anonymous

When working with the shelf, shelving a 'Renamed' file pair would put the original file back into the working directory and create an entry pair in the patch file for the added and deleted file (visualized with a blue 'plus' and red cross icon). Sometimes the latter doesn't happen anymore.

Reproduce:

  1. Open a repository with files,
  2. Rename one of the files externally,
  3. Refresh working directory and use 'Detect renames' to mark the pair of files as renamed,
  4. Go to the shelf (refresh if necessary) (create a new empty Shelf on the right if necessary),
  5. Click on the added file and move it to the right.

Expected: The shelve contains of the added (renamed). The working directory contains the removed file.

Actual: The shelve contains of the added (renamed). The working directory is empty.

Workaround: Always first move the deleted files to right, then move the added files (and the rest) the right.

Caveat: Using the "Move all to the right" button will move files in random order, so sometimes it moves the deleted before the added, triggering this bug in a highly inconvenient way.

Version: 4.5.2 for Linux

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