• Status: Solved
  • Priority: Medium
  • Security: Public
  • Views: 483
  • Last Modified:

How do I merge 2 code branches (3rd party updates)?

I bought the source code to a commercial product and have modified the code with my own changes. I am hoping for a good update strategy in the future when the software vendor has a new version out.

If I do a bunch of updates, and the software vendor does a bunch of updates, then how do I merge them together when the software vendor comes out with a new version?

I do not have source control set up yet, but I am thinking of using SVN with TortoiseSVN and even VisualSVN. I have used Visual Studio Team Foundation in the past, but it is overkill in this situation.

Any help on what my strategy should be to make software vendor updates as painless as possible to merge with my own code branch?
0
bemara57
Asked:
bemara57
  • 2
2 Solutions
 
alb66Commented:
SVN is a good tool.
Read "Common Use-Cases for Merging"
http://svnbook.red-bean.com/en/1.0/ch04s03.html#svn-ch-4-sect-3.2
0
 
alb66Commented:
0
 
digitalpacmanCommented:
Use DIFF and patching with subversion. (This is assuming you get the precompiled code, I don't think you would be able to merge a compiled program into another compiled program.)

To do this you have to download wingnu32 patch and svn client

Create one repo, commit your source to a directory.
Commit to another directory the source released by the software company.
DIFF the two using svn diff and output it to a patch file.

svn diff --old yourrepoURL --new theirrepoURL > filename.patch

Then apply the patch locally.

patch -p0 -u -i filename.patch -d yourlocalpath
0

Featured Post

The new generation of project management tools

With monday.com’s project management tool, you can see what everyone on your team is working in a single glance. Its intuitive dashboards are customizable, so you can create systems that work for you.

  • 2
Tackle projects and never again get stuck behind a technical roadblock.
Join Now