Solved

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

Posted on 2009-05-05
3
466 Views
Last Modified: 2013-11-25
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
Comment
Question by:bemara57
  • 2
3 Comments
 
LVL 19

Expert Comment

by:alb66
ID: 24311733
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
 
LVL 19

Accepted Solution

by:
alb66 earned 250 total points
ID: 24311737
0
 

Assisted Solution

by:digitalpacman
digitalpacman earned 250 total points
ID: 24327567
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

Find Ransomware Secrets With All-Source Analysis

Ransomware has become a major concern for organizations; its prevalence has grown due to past successes achieved by threat actors. While each ransomware variant is different, we’ve seen some common tactics and trends used among the authors of the malware.

Join & Write a Comment

Agile and Scrum have almost become synonymous. Have you wondered what's the difference? Scrum is just one way to be Agile. It is the most popular which leads to the common confusion. Agile actually refers to a philosophy shared by group of developme…
Exception Handling is in the core of any application that is able to dignify its name. In this article, I'll guide you through the process of writing a DRY (Don't Repeat Yourself) Exception Handling mechanism, using Aspect Oriented Programming.
This video discusses moving either the default database or any database to a new volume.
You have products, that come in variants and want to set different prices for them? Watch this micro tutorial that describes how to configure prices for Magento super attributes. Assigning simple products to configurable: We assigned simple products…

743 members asked questions and received personalized solutions in the past 7 days.

Join the community of 500,000 technology professionals and ask your questions.

Join & Ask a Question

Need Help in Real-Time?

Connect with top rated Experts

13 Experts available now in Live!

Get 1:1 Help Now