Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
TortoiseGit
TortoiseGit
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 303
    • Issues 303
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
    • Iterations
  • Merge requests 9
    • Merge requests 9
  • Requirements
    • Requirements
    • List
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test Cases
  • Analytics
    • Analytics
    • CI/CD
    • Code Review
    • Insights
    • Issue
    • Repository
    • Value Stream
  • Members
    • Members
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • TortoiseGit
  • TortoiseGitTortoiseGit
  • Issues
  • #77

Closed
Open
Created Aug 02, 2015 by Sven Strickroth@mrtuxOwner

"Show differencess" against a deleted file will cause TortoiseMerge to error

By peter.mou... on April 23, 2009 22:28 (imported from Google Code)


What steps will reproduce the problem?

  1. Delete a file from the repository
  2. Invoke either the commit dialog or the check-for-modifications dialog
  3. Double-click on the entry representing the deleted file

What is the expected output? What do you see instead?
I expect TortoiseMerge to show the contents of the file in the state it was before it was deleted;
instead, TM errors with

---------------------------
TortoiseMerge
---------------------------
The diffing engine aborted because of an error:
Can't open file 'C:_source\includecombiner\src\Nrws\Web\IncludeHandling\IncludeReader.cs':
The system cannot find the file specified.
---------------------------
OK
---------------------------

This does not happen in TortoiseSVN's TortoiseMerge circa 1.5.x and above.

What version of the product are you using? On what operating system?
0.5.1.0 on Windows 2008 Enterprise Server x64

Please provide any additional information below.

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