<br><br><div class="gmail_quote">On Fri, Jun 4, 2010 at 9:06 AM, Justin Ryan <span dir="ltr"><<a href="mailto:justin.ryan@reliefgarden.org">justin.ryan@reliefgarden.org</a>></span> wrote:<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
<div class="gmail_quote"><div><div class="h5"><div><br></div></div></div><div>Consider using shared repositories with a fresh branch for each merge:</div><div><br></div><div> <a href="http://wiki.bazaar.canonical.com/SharedRepositoryTutorial" target="_blank">http://wiki.bazaar.canonical.com/SharedRepositoryTutorial</a></div>
<div><br></div><div>Basically, you do something like this:</div><div><br></div><div> bzr init-repo zope.applicationcontrol --format=rich-root-pack #last I checked, bzr-svn liked this format, you can also --format=svn</div>
<div> cd zope.applicationcontrol</div><div> bzr branch lp:zope.applicationcontrol #bzr looks for .bzr in ., which tells it there is a shared storage</div><div><br></div></div></blockquote><div><br></div><div>Whups, you'd do something like:</div>
<div><br></div><div> bzr branch svn://<a href="http://svn.zope.org/public/zope.applicationcontrol">svn.zope.org/public/zope.applicationcontrol</a> merge-something-branch</div><div><br></div><div>This gives you a branch merge-something-branch within your zope.applicationcontrol shared repo.</div>
<div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;"><div class="gmail_quote"><div></div><div>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..</div>
<div><br></div><div>Best,</div><div><br></div><div>J</div></div>
</blockquote></div><br>