Still celebrating National IT Professionals Day with 3 months of free Premium Membership. Use Code ITDAY17

x
?
Solved

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

Posted on 2009-05-05
3
Medium Priority
?
481 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
[X]
Welcome to Experts Exchange

Add your voice to the tech community where 5M+ people just like you are talking about what matters.

  • Help others & share knowledge
  • Earn cash & points
  • Learn & ask questions
  • 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 1000 total points
ID: 24311737
0
 

Assisted Solution

by:digitalpacman
digitalpacman earned 1000 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

Concerto Cloud for Software Providers & ISVs

Can Concerto Cloud Services help you focus on evolving your application offerings, while delivering the best cloud experience to your customers? From DevOps to revenue models and customer support, the answer is yes!

Learn how Concerto can help you.

Question has a verified solution.

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

Entity Framework is a powerful tool to help you interact with the DataBase but still doesn't help much when we have a Stored Procedure that returns more than one resultset. The solution takes some of out-of-the-box thinking; read on!
Read about the ways of improving workplace communication.
With the power of JIRA, there's an unlimited number of ways you can customize it, use it and benefit from it. With that in mind, there's bound to be things that I wasn't able to cover in this course. With this summary we'll look at some places to go…
Progress

721 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