From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel Subject: Re: [ELPA-diffs] /srv/bzr/emacs/elpa r374: company: Release 0.6.2 Date: Mon, 25 Mar 2013 15:20:16 +0400 Message-ID: <515032F0.7060301@yandex.ru> References: <514E5164.9090901@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1364210438 11337 80.91.229.3 (25 Mar 2013 11:20:38 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Mar 2013 11:20:38 +0000 (UTC) Cc: emacs-devel To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Mar 25 12:21:00 2013 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UK5SV-0003aX-6s for ged-emacs-devel@m.gmane.org; Mon, 25 Mar 2013 12:20:59 +0100 Original-Received: from localhost ([::1]:59767 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UK5S7-0001gB-0A for ged-emacs-devel@m.gmane.org; Mon, 25 Mar 2013 07:20:35 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:48232) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UK5Rz-0001fw-A4 for emacs-devel@gnu.org; Mon, 25 Mar 2013 07:20:32 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UK5Rt-0004wv-NS for emacs-devel@gnu.org; Mon, 25 Mar 2013 07:20:27 -0400 Original-Received: from mail-la0-x230.google.com ([2a00:1450:4010:c03::230]:48553) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UK5Rt-0004wb-Ef for emacs-devel@gnu.org; Mon, 25 Mar 2013 07:20:21 -0400 Original-Received: by mail-la0-f48.google.com with SMTP id fq13so10893410lab.7 for ; Mon, 25 Mar 2013 04:20:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding:x-antivirus:x-antivirus-status; bh=/J+16ApRjAWFFqvwlDkyi87t2dtO4W10i5L8g5cPzU0=; b=QzGuy2yAJDRRB2t906/W61Ysu1kJRrOnbWUzRoxWzRlNG537tb2zR3nu5V0Bpj6H5Z LOvZfqNqE1oIhysnCP/6XlkF66YxyltmPtV8LEPqjw1X0SZUANh2h2S/evKat8HpUXI7 MxRVcAVc297uQ3pPC7CQlWcVhKd0pmsBcxkDGyaASptQZxjE81UPlI+ihzlEb+DisTAU Mhn0qxbEk2pi0wM1zAp9y7+817FOvUjlFvVVtUfIcCbghzR/3ou8AeaWyhx9KbgFi7xe VhuBjmi/EYIU+hQE1URFNzpyvrPLwffuUH4Zw1OT2/4qUabjpdogKx7Dr0TTvDKrWfR0 yuNA== X-Received: by 10.152.110.167 with SMTP id ib7mr5868760lab.22.1364210420055; Mon, 25 Mar 2013 04:20:20 -0700 (PDT) Original-Received: from [127.0.0.1] ([178.252.98.87]) by mx.google.com with ESMTPS id hk10sm4934251lab.4.2013.03.25.04.20.18 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 25 Mar 2013 04:20:19 -0700 (PDT) User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130307 Thunderbird/17.0.4 In-Reply-To: X-Antivirus: avast! (VPS 130324-1, 25.03.2013), Outbound message X-Antivirus-Status: Clean X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::230 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:158119 Archived-At: 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:"? > 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: git@github.com: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 : 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 : 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.