help requested for stitching the history of 3 VCSes

Jeff web.kiddo at free.fr
Sat May 17 06:13:32 BST 2008


Sorry for replying slowly, school as usual :) So, I just spent a while
trying to use your suggestion but I am stuck again. What I did was

bzr branch specto-cvs-rrp specto-cvs-rrp-rebaseprep (this would be used
to add a "new" commit between the cvs and svn version)
bzr branch specto-svn specto-svn-rev2 (and bzr revert -r2)

then move/remove/add some stuff around in specto-cvs-rrp-rebaseprep by
comparing with specto-svn-rev2:

        added data
        added launch.sh
        added data/doc
        renamed glade => data/glade
        renamed icons => data/icons
        renamed AUTHORS => data/doc/AUTHORS
        renamed COPYING => data/doc/COPYING
        renamed ChangeLog => data/doc/ChangeLog
        renamed HACKING => data/doc/HACKING
        renamed INSTALL => data/doc/INSTALL
        renamed VERSION => data/doc/VERSION
        added po/generate_template.sh
        renamed pygettext.py => po/pygettext.py
        renamed specto => src/specto.py
        deleted NEWS
        deleted README
        deleted TODO
        deleted make_messages.sh
        deleted make_regenerate.sh
        deleted templates
        deleted templates/normal.py
        deleted templates/special_watch.py
        Committed revision 262.

bzr branch specto-cvs-rrp-rebaseprep specto-rebase
cd specto-rebase
bzr replay -r1..85 ../specto-svn 
(I also tried bzr replay -r2..85 ../specto-svn)

...and now I am stuck with tracebacks (attached to this message). I'm
lost. I feel I'm pretty close but I must be missing something, or doing
it wrong.
I have compressed all the bzr branches I am using in this, into a
tar/lzma archive if it can help: http://public.ecchi.ca/rebase-fun.lzma
file-roller should be able to open it.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20080517/2294e23e/attachment.htm 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: replay errors.log
Type: text/x-log
Size: 5319 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080517/2294e23e/attachment.bin 


More information about the bazaar mailing list