On Fri, Jun 4, 2010 at 9:06 AM, Justin Ryan <justin.ryan@reliefgarden.org> wrote:

Consider using shared repositories with a fresh branch for each merge:

  http://wiki.bazaar.canonical.com/SharedRepositoryTutorial

Basically, you do something like this:

  bzr init-repo zope.applicationcontrol --format=rich-root-pack #last I checked, bzr-svn liked this format, you can also --format=svn

  cd zope.applicationcontrol
  bzr branch lp:zope.applicationcontrol #bzr looks for .bzr in ., which tells it there is a shared storage

Whups, you'd do something like:

bzr branch svn://svn.zope.org/public/zope.applicationcontrol merge-something-branch

This gives you a branch merge-something-branch within your zope.applicationcontrol shared repo.

What this does is allow you to have multiple local branches of something without wasting full repo storage on each one. This func goes back at least to BitKeeper and may be able to use hardlinks to further reduce storage redundancy, though that can lead to pain, suffering, anger, etc..

Best,

J