help requested for stitching the history of 3 VCSes

James Henstridge james at jamesh.id.au
Sun May 4 04:24:38 BST 2008


On 03/05/2008, Jeff <web.kiddo at free.fr> wrote:
>
>  I tried and stuck on step 3:
>
>  jeff at kiki:~/trunks/awesome-new-specto/specto-rebase$ bzr
> replay -r0.. ../specto-svn/
>  bzr: ERROR: Repository
> KnitPackRepository('file:///home/jeff/trunks/awesome-new-specto/specto-rebase/.bzr/repository/')
> is not compatible with repository
> KnitPackRepository('file:///home/jeff/trunks/awesome-new-specto/specto-svn/.bzr/repository/')
>  Then I assumed this was because specto-rebase was just branched from
> specto-cvs which is still pack-0.92, so I removed did a bzr upgrade
> --rich-root-pack on specto-rebase and retried the replay procedure with the
> same command.

Yep, it looks like replay requires the branches to have compatible formats.

> This time, I got:
>
>  bzr: ERROR: Reserved revision-id {null:}
>  What did I do wrong?

You are running "bzr replay -r0..", when you should be replaying from
the revision after where the branches are identical.  So if r1 of your
SVN branch has identical contents to the final revision of your CVS
history, run "bzr replay -r2.. svnbranch".

James.


More information about the bazaar mailing list