I created a branch at revision 2000 of the trunk. I renamed some files in the trunk at revision 2141. I edited these files in the branch at revision 2194. Now I want to merge the changes from the branch back to the trunk, but it causes a tree conflict because files have been renamed there. This is okay.
Not okay is, that a window pops up and tells me "fetching tree conflict information" and searches back until revision 1359 and hangs there forever. In r1359 we had many edits (files and folders renamed, files deleted) because we converted our code from C++/CLI (.cpp, .h) to C# (.cs). Somehow this fetching dialog doesn't like that, even though the conflicting files were not part of the commit for r1359. Why does it hang? Why does it search back so far? It's not needed. Best regards Tobias -- You received this message because you are subscribed to the Google Groups "TortoiseSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/13a721a8-f7b3-48da-8763-3d2597a77674%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
