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
  • #4894
Closed
Open
Created Sep 06, 2017 by Bitbucket Importer@bitbucket_importerOwner

Diff to Local does not copy back new files

Created originally on Bitbucket by njackowski (Nick Jackowski)

Tortoise 4.3.1 x64 Windows 7 Beyond Compare 4

default Branch: FileA.txt content:A FileC.txt content:C

Branch B: FileA.txt content:A FileB.txt content:B

If I do a "Diff to Local" from Branch B, the directory diff tools shows up. The diff shows as expected and FileB is only in Branch B and FileC is only in default. I copy FileB to default. In the background temp directory FileB shows up. I close the diff tool then refresh my working directory but FileB never gets moved back to the real working directory from the temp directory.

Also, I have a similar problem with copying files that are on both sides with the same size but internally different. Both temps are created with the same date time stamp. Beyond Compare allows an easy copy file from one directory to the other. I do the copy. Close the directory diff. No change in the working directory.

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