Say I have version 1.0 of vendor code. I keep a vendor branch, and, tag it. I now modify that code in trunk, and, save it. So, I have a modified version 1.0. It runs for a while, and now version 2.0 of the vendor code comes out. What is the correct SmartSVN method of handling this? What I want to do is to take the changes the vendor made, and, apply them (perhaps with some exceptions of course) to my modified version.
I have tried a merge from two sources, old vendor and new vendor, but that leaves all sorts of extra files around that are not in the vendor 2.0 code, but, were in vendor 1.0 code. Amongst other issues. So, I presume this is the wrong way.
I just don't know the best way to do this in SmartSVN.
I have tried a merge from two sources, old vendor and new vendor, but that leaves all sorts of extra files around that are not in the vendor 2.0 code, but, were in vendor 1.0 code. Amongst other issues. So, I presume this is the wrong way.
I just don't know the best way to do this in SmartSVN.