Re: [ELPA-diffs] /srv/bzr/emacs/elpa r374: company: Release 0.6.2

[Dmitry Gutov]

On 24.03.2013 18:14, Stefan Monnier wrote:
> > What's the recommended way to automatically pull commit messages from Git to
> > Bazaar? What if the Git repo has some files that Bazaar doesn't?
>
> Install bzr-git, and then "bzr merge git:<blabla>"?
> The first time needs extra work (because of the lack of a common
> ancestor) but I can do that part if it's not done yet.

Please go head. It would be also helpful if you document the exact 
sequence of commands you use.

The repository URL: address@hidden:company-mode/company-mode.git

My achievement so far:

C:\Users\gutov\vc\emacs-bzr\elpa\packages\company>bzr merge 
git://github.com/company-mode/company-mode.git
bzr: ERROR: exceptions.AssertionError: Invalid sha for <Commit 
6aea960adb30c66faa14e4bd57a4e62e94eacd94>: 
2a59ce05bd0a86db1911f07adb942f10b8540614

Traceback (most recent call last):
  File "bzrlib\commands.pyo", line 920, in exception_to_return_code
  File "bzrlib\commands.pyo", line 1131, in run_bzr
  File "bzrlib\commands.pyo", line 673, in run_argv_aliases
  File "bzrlib\commands.pyo", line 695, in run
  File "bzrlib\cleanup.pyo", line 136, in run_simple
  File "bzrlib\cleanup.pyo", line 166, in _do_with_cleanups
  File "bzrlib\builtins.pyo", line 4425, in run
  File "bzrlib\builtins.pyo", line 4571, in _get_merger_from_branch
  File "bzrlib\merge.pyo", line 423, in from_revision_ids
  File "bzrlib\merge.pyo", line 517, in set_other_revision
  File "bzrlib\merge.pyo", line 534, in _maybe_fetch
  File "bzrlib\decorators.pyo", line 218, in write_locked
  File "bzrlib\branch.pyo", line 698, in fetch
  File "C:/Users/gutov/bazaar/2.0/plugins\git\branch.py", line 722, in 
fetch
  File "C:/Users/gutov/bazaar/2.0/plugins\git\branch.py", line 745, in 
fetch_objects
  File "C:/Users/gutov/bazaar/2.0/plugins\git\fetch.py", line 706, in 
fetch_objects
  File "C:/Users/gutov/bazaar/2.0/plugins\git\object_store.py", line 
580, in _lookup_revision_sha1
  File "C:/Users/gutov/bazaar/2.0/plugins\git\object_store.py", line 
384, in _update_sha_map
  File "C:/Users/gutov/bazaar/2.0/plugins\git\object_store.py", line 
484, in _update_sha_map_revision
  File "C:/Users/gutov/bazaar/2.0/plugins\git\object_store.py", line 
473, in _revision_to_objects
  File "C:/Users/gutov/bazaar/2.0/plugins\git\object_store.py", line 
154, in _check_expected_sha
AssertionError: Invalid sha for <Commit 
6aea960adb30c66faa14e4bd57a4e62e94eacd94>: 
2a59ce05bd0a86db1911f07adb942f10b8540614

bzr 2.5.1 on python 2.6.6 (Windows-7-6.1.7601-SP1)
arguments: ['bzr', 'merge', 
'git://github.com/company-mode/company-mode.git']
plugins: bisect[1.1.0dev], bzrtools[2.5.0], changelog_merge[2.5.1],
    colo[0.4.0], fastimport[0.14.0dev], git[0.6.8], launchpad[2.5.1],
    loom[2.3.0dev], netrc_credential_store[2.5.1], news_merge[2.5.1],
    pipeline[1.4.0], qbzr[0.22.3], rewrite[0.6.4dev], svn[1.2.2],
    upload[1.2.0dev], xmloutput[0.8.8]
encoding: 'cp1251', fsenc: 'mbcs', lang: 'RU'

*** 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.

Looks similar to this: https://bugs.launchpad.net/bzr-git/+bug/753155

I've no idea where to go from here.