Hello again, just to inform others, it was solved it by updating python library fastimport (to the development version, but I suppose my version was just outdated).
It seems that the conversion script worked and our xhci branch is live:
https://github.com/helenos-xhci-team/helenos
We're sorry for dzejrou's karma, but for most of us this is a relief :)
Thanks for providing the script and info!
Ondra
On 13.11., Ondra Hlavatý wrote:
> Hi!
>
> We would like to import our xhci branch, but the import currently fails
> somewhere inside bazaar. It happens both when I try to `git bzr clone`
> or just `git bzr import` our bazaar branch.
>
> > 13:16:11 5000/11087 commits exported at 2742/minute
> > 13:16:11 Skipping empty dir uspace/dist/dev in rev
> > m.lombard...@gmail.com-20110904113058-trhdshrggn5s480c
> > bzr: ERROR: exceptions.UnicodeDecodeError: 'ascii' codec can't decode byte
> > 0xc5 in position 2: ordinal not in range(128)
> >
> > Traceback (most recent call last):
> (... stacktrace removed ...)
> > UnicodeDecodeError: 'ascii' codec can't decode byte 0xc5 in position 2:
> > ordinal not in range(128)
> >
> > bzr 2.7.0 on python 2.7.14 (Linux-4.13.11-1-ARCH-x86_64-with-glibc2.2.5)
> > arguments: ['/usr/bin/bzr', 'fast-export', '--plain', '--export-
> > marks=/home/ohlavaty/projects/xhci/.git/bzr/map/xhci-bzr', '--git-
> > branch=bzr/xhci', '/home/ohlavaty/projects/xhci/.git/bzr/repo/xhci']
> > plugins: bash_completion[2.7.0], bisect[1.1.0dev], changelog_merge[2.7.0],
> > etckeeper[unknown], fastimport[0.14.0dev], grep[2.7.0], gtk[0.104.0],
> > launchpad[2.7.0], netrc_credential_store[2.7.0], news_merge[2.7.0],
> > po_merge[2.7.0], qbzr[0.23.2], rewrite[0.6.4dev], stats[0.2.0dev],
> > weave_fmt[2.7.0]
> > encoding: 'utf-8', fsenc: 'UTF-8', lang: 'cs_CZ'
> >
> > *** Bazaar has encountered an internal error. This probably indicates a
> > bug in Bazaar. You can help us fix it by filing a bug report at
> > https://bugs.launchpad.net/bzr/+filebug
> > including this traceback and a description of the problem.
> > ERROR:root:bzr export failed
>
> Have you experienced this and if so, how did you solve it?
>
> Thanks in advance,
> Ondra
>
> On 12.11., Jan Vesely wrote:
> > nice.
> >
> > Here's the script that I sued to concatenate svn and bzr history for
> > those who are interested:
> >
> > #!/bin/sh
> > echo 4e161aaa908906c0ebaa75582bc7b5e529f2e785
> > 9035c5a039d04f61d696becf12fa6c74cbabe5ae > .git/info/grafts
> > git filter-branch -f --tag-name-filter cat -- --all
> > rm .git/info/grafts
> >
> >
> > bzr history was moved to git using git-bzr-ng.
> > 4e161aaa ("add '.bzr' to the ignore lists") is the second commit of bzr
> > history, after the initial import.
> >
> > 9035c5a03 ("Bump version to 0.4.1 (Escalopino).") is the last commit of
> > svn history.
> >
> > grafts are used to redirect local history. git filter branch then
> > rewrites it with that modification. Note that the rewritten hashes are
> > stable in a sense that bzr history can be forwarded (using git bzr
> > pull), and the shared commits between old and new will be identical
> > after running the concat script.
> >
> > hope this helps if someone wants to convert their own branches,
> > Jan
> >
> > On Sun, 2017-11-12 at 21:01 +0100, Jakub Jermář wrote:
> > > Hi all,
> > >
> > > from now on please use:
> > >
> > > https://github.com/HelenOS/helenos
> > >
> > > as the new mainline repository.
> > >
> > > Even though the new repository contains a conversion of the old bzr and
> > > svn repositories, the old bzr repository should stay around in read-only
> > > mode at its current location.
> > >
> > > We also plan to maintain a clone of this on helenos.org later.
> > >
> > > Jakub
> > >
> > > _______________________________________________
> > > HelenOS-devel mailing list
> > > HelenOS-devel@lists.modry.cz
> > > http://lists.modry.cz/listinfo/helenos-devel
>
>
>
> > _______________________________________________
> > HelenOS-devel mailing list
> > HelenOS-devel@lists.modry.cz
> > http://lists.modry.cz/listinfo/helenos-devel
>
> _______________________________________________
> HelenOS-devel mailing list
> HelenOS-devel@lists.modry.cz
> http://lists.modry.cz/listinfo/helenos-devel
signature.asc
Description: PGP signature
_______________________________________________ HelenOS-devel mailing list HelenOS-devel@lists.modry.cz http://lists.modry.cz/listinfo/helenos-devel
