From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: [ELPA-diffs] /srv/bzr/emacs/elpa r374: company: Release 0.6.2 Date: Sat, 30 Mar 2013 13:12:40 -0400 Message-ID: References: <514E5164.9090901@yandex.ru> <515032F0.7060301@yandex.ru> <51566B13.2000708@gmail.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1364663569 8576 80.91.229.3 (30 Mar 2013 17:12:49 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 30 Mar 2013 17:12:49 +0000 (UTC) Cc: emacs-devel To: Dmitry Gutov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Mar 30 18:13:16 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 1ULzL6-0002MG-UM for ged-emacs-devel@m.gmane.org; Sat, 30 Mar 2013 18:13:13 +0100 Original-Received: from localhost ([::1]:44632 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULzKi-00021B-I0 for ged-emacs-devel@m.gmane.org; Sat, 30 Mar 2013 13:12:48 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:35452) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULzKd-00020j-CA for emacs-devel@gnu.org; Sat, 30 Mar 2013 13:12:45 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ULzKb-0004Oa-Va for emacs-devel@gnu.org; Sat, 30 Mar 2013 13:12:43 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.182]:2938) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULzKb-0004OP-Qs for emacs-devel@gnu.org; Sat, 30 Mar 2013 13:12:41 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av4EABK/CFFFxLSu/2dsb2JhbABEvw4Xc4IeAQEEAVYjBQsLDiYSFBgNJIgeBsEtkQoDlymNUYFegxM X-IPAS-Result: Av4EABK/CFFFxLSu/2dsb2JhbABEvw4Xc4IeAQEEAVYjBQsLDiYSFBgNJIgeBsEtkQoDlymNUYFegxM X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="6105252" Original-Received: from 69-196-180-174.dsl.teksavvy.com (HELO pastel.home) ([69.196.180.174]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 30 Mar 2013 13:12:38 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id C031E67BF5; Sat, 30 Mar 2013 13:12:40 -0400 (EDT) In-Reply-To: <51566B13.2000708@gmail.com> (Dmitry Gutov's message of "Sat, 30 Mar 2013 08:33:23 +0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.182 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:158480 Archived-At: > 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 6aea960adb30c66faa14e4bd57a4e62e94eacd94>: > 2a59ce05bd0a86db1911f07adb942f10b8540614 In my experience bzr-git works significantly better on a local branch, so I always first make a local Git clone. More specifically I normally do: git clone # Done because bzr-git works better locally bzr branch tmp cd tmp bzr mkdir .newroot bzr mv * .newroot/ ... maybe other bzr mv . .newroot/ ... bzr split .newroot mv .newroot .../elpa/packages/ cd .../elpa/packages/ bzr join the "bzr mv+bzr split" dance is necessary to work around a limitation of bzr-git where all the root directories have the same "id", so the first "bzr join" worked (tho it introduced the all too famous commit that then triggers a bug in "bzr checkout"), but ever since we first need to do this dance that moves all the files to another root directory (hence with a different "id"). This said, I just tried it and the "bzr join" failed with "inventory already contains entry with id {README.md}": apparently there are more problems of id-collisions than the root directory. > Do you mind if, while ELPA transition to Git is still is progress, I commit > the latest version in the same manner as before? No, please do. Just please try and preserve some of the info, e.g. by copying the "git log" or at the the revision id from which you merged. Stefan