Maintaining customizations to a third-party library involves three data sources: We'd like to upgrade to this new version, but without losing the customizations we made to the existing version. But things aren't always that simple, and in fact it is quite common for source files to get moved around between releases of software.
Unfortunately, it's not always the case that third-party libraries are publicly accessible via Subversion. This means the burden falls to the user to know which merges have been performed on their vendor branch, and just how to construct the next merge when upgrading that branch.
I wil try again tomorrow.
Once Subversion knows about the history of a given source file—including all its previous locations—the process of merging in the new version of the library is pretty simple. However, you could probably do it like this:. If you are merging revisions in chunks, the method shown in the Subversion book will have you merge 100-200 this time and 200-300 next time.
I have to be honest, in my own system, I personally checkout CVS from cvs.
James Hugard James Hugard 2,677 1 19 31. Our copy will create a new directory called libcomplex in our existing calc project directory. This method covers the case when you have made one or more revisions to a branch or to the trunk and you want to port those changes across to a different branch.
Then branch right away into "... However, you could probably do it like this: We'll call our vendor branch directory libcomplex , and our code drops will go into a subdirectory of our vendor branch called current.
We'll then look at how we can upgrade to libcomplex 1. Is there an example using the tortoisesvn client?
This discards changes from the merge source which conflict with your local changes. In those situations, it can be much more challenging to morph the new vendor tag into a state where it accurately reflects the vendor drop it claims to reflect.
This work is licensed under the Creative Commons Attribution License v2.