I’ve never forked a project before so I’m a little stumped as to how to proceed. I have a project that I use on my own that I release as a BSD licensed project (Project A). At work I want to use that code but with modifications specific to our company (Project B) but I want to be able to still update with features that come from the base code I release.
What’s the best way to handle having two forks of a project and incorporating changes from Project A into Project B without overwriting the mods I make to Project B?
It is being split into two entities with my main repo on Google Code and then the company version in our own internal repo. My question is keeping everything sane as it comes time to upgrade from release to release but keeping custom modifications.
See the section in previously mentioned The Subversion Book discussing ‘vendor branches’. This dicusses how to deal with an external subproject so you can both merge in changes when the external project is updated and merge in your own local modifications.
This approach should work well if you treat the public version of your project (hosted on Google Code) as the extenal dependency in your companie’s code.