Starting to use vendor branch with existing code

2014-09-22 Thread Phillip Seaver
We are using vendor branches for most third-party libraries, but there are a few projects in our source tree that haven't been brought in via vendor branches. Some of them have local modifications, too. Is there a recommended way to start using vendor branches with them? For one unmodified proje

Exception during reintegration merge dry run in TortoiseSVN

2013-07-16 Thread Phillip Seaver
>From the error dialog: "In file 'D:\Development\SVN\Releases\TortoiseSVN-1.8.0\ext\subversion\subversion\libsvn_ra_serf\util.c' line 1649: internal malfunction" In TortoiseSVN, I choose "Reintegrate a branch / automatic merge", picked the correct branch, and pressed the "Test merge" button.