Bug in tortoiseMerge

tortoiseMerge doesn't like applying patches that contain the same file name more than once.

That is, it complains if the patch contains /project/dir1/test.sh AND /project/dir2/test.sh The "file patches" window lists the filename in red (no mention that they are in separate directories) and raises the error:

The file test.sh
was found twice!?! T
his usually happens if you applied a patchfile to the
wrong folder!

The workaround is to create patches that are not recursive, or process the patchfile by hand to make sure the same file doesn't appear twice, regardless of being in different directories.

I'm not subscribed to the list, please forward any comments to me directly.

Thanks,
-jon
Received on Tue Jul 18 18:35:31 2006