Solved

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

Posted on 2009-05-05
3
467 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

Is Your Active Directory as Secure as You Think?

More than 75% of all records are compromised because of the loss or theft of a privileged credential. Experts have been exploring Active Directory infrastructure to identify key threats and establish best practices for keeping data safe. Attend this month’s webinar to learn more.

Question has a verified solution.

If you are experiencing a similar issue, please ask a related question

Suggested Solutions

Title # Comments Views Activity
Version control tool for visual studio 2010 3 20
Calling stored proc in EDMX 11 23
Linq Help 1 34
Syntax Error 2 42
I worked at a US software company that used offshore contractors for ten years and offshore employees for three years. We had a positive experience and you can too.   When I interviewed people for positions in the US, I would tell them that we wor…
Online collaboration can help businesses be more efficient, help employees grow their skills and foster a team environment.
Concerto provides fully managed cloud services and the expertise to provide an easy and reliable route to the cloud. Our best-in-class solutions help you address the toughest IT challenges, find new efficiencies and deliver the best application expe…
With Secure Portal Encryption, the recipient is sent a link to their email address directing them to the email laundry delivery page. From there, the recipient will be required to enter a user name and password to enter the page. Once the recipient …

930 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

9 Experts available now in Live!

Get 1:1 Help Now