Version control

From Arnout Engelen

Jump to: navigation, search

Sometimes, you want to use a free software library/project, but with a few small changes.

In its simples form, you can simply checkout the latest CVS/SVN, make changes to that, and keep track of upstream changes by updating every now and then.

This approach has 2 limitations:

  • the changes remain 'local' until I create and publish a patch manually
  • It's not possible to collaborate on the changes easily

It'd be nice to have a local 'child' version control server, that makes it easy to track 'upstream' updates, while maintaining and making available local changes.

The Bazaar version control system is designed to allow this kind of branching. Looks pretty interesting. If the 'upstream' people don't have bazaar, there is an importing service available.

[edit] Version control browser wishlist

I'd love a tool that shows a TREE with all updates to (e.g.) an SVN (sub)tree, where it's clear which branch branched from another, and to which branch changes where made. Still looking for that...

I mocked something up: http://bzzt.net:8080/svnviewer-SNAPSHOT

Looking for feedback and an existing project to integrate this feature into.

Candidates:

Personal tools