applying patch fails when applying from TortoiseMerge utility and files have duplicate name
By [email protected] on March 23, 2012 20:16 (imported from Google Code)
What steps will reproduce the problem?
- Make a git patch which adds two files with exacty the same names but to different directories.
- Left click on the patch -> TortoiseGit -> Review/Apply the patch.
- 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 admin enable hashed storage. More information