Best practice for bzr-svn mirror?

[Matt McClure]

Russel,

On Sat, Feb 21, 2009 at 2:28 AM, Russel Winder
<russel.winder at concertant.com> wrote:
> The issue here is rebasing -- which is both a good thing and a bad
> thing.
>
> In order to ensure good history, rebasing the Bazaar branch (or Git
> repository) against the Subversion repository is a good thing.  However
> this immediately destroys any capability of exchanging things directly
> in a traditional DVCS way.

Thanks for writing up the explanation of how you use Bazaar with Subversion.

I've been working on a Perforce plugin for Bazaar, and I'm finding
rebasing excruciating.  Coming from a centralized VCS background, my
mental model is that rebasing is analogous to "syncing" or "updating"
a working copy that has local changes with new upstream changes in the
depot/repository.  Rebasing and updating both make the upstream
changes appear before my local changes in the history.

In the centralized VCS case, the update can cause conflicts, which I
resolve once per update.  With a DVCS when I rebase, it seems in the
worst case that I have to resolve conflicts once per rebased local
revision.  I tend to have many local revisions with small changes,
making rebasing quite painful.

Could I be doing something differently to make rebasing easier?

Regards,
Matt