We have two different projects on o开发者_开发百科ur source safe database (one of them is a copy of another one for some reasons there was a problem with our branching operation that didn't pin our branched files therefore I had to get a label and add it as a different project) I know how I can see the differences between two projects and I know that there is a mechanism that let us merge differences into one file (I think "reconcile all" will do the trick but i am not sure)
So here's my question how can I merge a file in a project with another file from another project?
VSS (or as i call it, source destruction system) will destroy your code if you try to merge it using the built-in tools. Why does it do that ? .. because its a lame tool.
This is what i recommend
- Get latest both branches.
- Get the last version of the code before you branched. (just see the date and guess if you have to)
- Do a 3-way merge because you have a base.
- add the merged files into subversion (or something better than sourcesafe).
I have many old projects stored in sourcesafe. Its hopeless trying to use the built-in tools to do anything other than get latest, checkin and checkout.
- Checkout the latest version of the first VSS somewhere.
- Create a repository using a different VCS tool (Subversion should be the most simple choice).
- Import the project version into the new Subversion repo as a branch.
- Checkout the latest version of the second VSS somewhere else.
- Import the project version into the new Subversion repo in a different branch.
- Use any Subversion tools to merge the two branches.
精彩评论