Andrey Khavryuchenko himself

Autofollowing an open source project

Looks like the next biggest time eater (NBTE? ) during our development are the efforts to follow public projects repositories.

See, we develop web software mostly by integrating already available open source components. But what if a component is not yet stable and is actively developed?

Also, we often have to branch these projects to implement our own modifications: bug fixes or new features. Thanks to git that’s easy, but what about keeping track on the development of the original project?

Let the ‘master’ branch follow an svn and local modifications be integrated in the branch ‘local’. Then, the workflow is easy:

• git svn rebase on the ‘master’ branch
• optionally run the tests
• git merge --no-commit master on the ‘local’ branch
• optionally run the tests
• commit if tests are ok
• move ‘last good’ tag on a ‘master’ and ‘local’ branches

Will spend couple of hours in next few days to implement and get a feeling how that works in real life.

Wanna lend me an hours per day extra?