CODEWITHSUNDEEP
version-control
Andrew Connell
Andrew Connell

Reputation: 5287

Is there a better way to keep your own copy of a customized open source project?

I use an open source project to host a site (OrchardCMS) which is available in a GIT repository via CodePlex. I have made a few customizations to the source code that are specific to my implementation and I want to keep preserved and under source control. However the challenge arises when there's a new release of the source engine.

My changes certainly won't go into the blessed repository everyone uses.

Currently I'm using two repositories. I use the CodePlex OrchardCMS repository to get the latest changes from the engine the community uses (and that I contribute some bug fixes to).

I then have my own copy which contains my changes. For this, I am using my own source control (hosted TFS from Microsoft). When an update to the core engine comes out, I XCOPY all the files from the current source to my self-maintained repository and commit them to my project.

However this seems like there should be a better option. Any opinions?

Upvotes: 1

Views: 76

Answers (1)

Atropo
Atropo

Reputation: 12531

You can use git to have an alternative solution.

You can clone the git main repo and keep it updated with the new relases, and you can keep your local modifications, that aren't to be shared with anyone, on a local branch.

When a new release came out, you simply update your master branch in your git repo an then you can rebase or merge your local modications on top of it.

Upvotes: 2

Related Questions