Skip to content
GitLab
    • GitLab: the DevOps platform
    • Explore GitLab
    • Install GitLab
    • How GitLab compares
    • Get started
    • GitLab docs
    • GitLab Learn
  • Pricing
  • Talk to an expert
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
    Projects Groups Topics Snippets
  • Register
  • Sign in
  • TortoiseGit TortoiseGit
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
    • Locked files
  • Issues 384
    • Issues 384
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 14
    • Merge requests 14
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Artifacts
    • Schedules
    • Test cases
  • Deployments
    • Deployments
    • Releases
  • Packages and registries
    • Packages and registries
    • Model experiments
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Insights
    • Issue
    • Repository
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • TortoiseGitTortoiseGit
  • TortoiseGitTortoiseGit
  • Issues
  • #1117
Closed
Open
Issue created Aug 02, 2015 by Sven Strickroth@mrtuxOwner

applying patch fails when applying from TortoiseMerge utility and files have duplicate name

By vil...@lnk.lt on March 23, 2012 20:16 (imported from Google Code)


What steps will reproduce the problem?

  1. Make a git patch which adds two files with exacty the same names but to different directories.
  2. Left click on the patch -> TortoiseGit -> Review/Apply the patch.
  3. Click Patch all items.

What is the expected output? What do you see instead?
The patch should apply without a problem, however tortoisemerge just stalls on the second file reporting NUL NUL in left and right windows.

What version of the product are you using? On what operating system?
1.7.7.0
msysgit 1.7.9
Windows XP

Please provide any additional information below.
This makes nearly impossible to apply patches which has Added files in them and have conflicts elsewhere in the patch.

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