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: Sat, 30 Mar 2013 21:49:41 +0400 Message-ID: <515725B5.20509@yandex.ru> 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; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1364665798 28426 80.91.229.3 (30 Mar 2013 17:49:58 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 30 Mar 2013 17:49:58 +0000 (UTC) Cc: emacs-devel To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Mar 30 18:50:25 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 1ULzv2-0005Dg-A9 for ged-emacs-devel@m.gmane.org; Sat, 30 Mar 2013 18:50:20 +0100 Original-Received: from localhost ([::1]:49752 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULzue-0000Qu-2F for ged-emacs-devel@m.gmane.org; Sat, 30 Mar 2013 13:49:56 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:41401) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULzuX-0000Qb-53 for emacs-devel@gnu.org; Sat, 30 Mar 2013 13:49:53 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ULzuT-0006JZ-6C for emacs-devel@gnu.org; Sat, 30 Mar 2013 13:49:49 -0400 Original-Received: from mail-lb0-f180.google.com ([209.85.217.180]:45280) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULzuS-0006JR-UY for emacs-devel@gnu.org; Sat, 30 Mar 2013 13:49:45 -0400 Original-Received: by mail-lb0-f180.google.com with SMTP id t11so1012058lbi.11 for ; Sat, 30 Mar 2013 10:49:43 -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=g9CQ42hDRIVWhkGKobmOIa2xMZ2id7BDMSUu57ISma0=; b=kXYf3cQBORyxMPtsRrJjXy1kcTDbg/HhFlYkj2ozzsL3XiIFfK+O/ozjnYyfYaqvaX kNtjlAMJ3GkZrIaCeFwzIJnXfdyOk3c8Sq3UKC+uRdtsMwryPKvF1auV++gARogko2pi o7IprYyj5fAW4ZStL3MwceAnqn4HoinvlEKrexS2din3YA/KnzaUNcLb1jMtMkvWsqz0 /wfTU4YA/2kPp7J4GRzkFj9LhpbV8xmavQKtOtT9Qz0pMsVmPZmS4CF1rK+37qc2cZxX Oz3XQb6TcUP3AeRTsG8CWWD+rsWA+P19gr3pPivTIPe9BI3gNcZfvhRfENpnxEOiwjVc NysA== X-Received: by 10.112.136.4 with SMTP id pw4mr2694945lbb.79.1364665783839; Sat, 30 Mar 2013 10:49:43 -0700 (PDT) Original-Received: from [127.0.0.1] ([178.252.98.87]) by mx.google.com with ESMTPS id mq7sm2878489lab.1.2013.03.30.10.49.42 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 30 Mar 2013 10:49:42 -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 130330-0, 30.03.2013), Outbound message X-Antivirus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.217.180 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:158484 Archived-At: On 30.03.2013 21:12, Stefan Monnier wrote: >> 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"). Thank you, I think I even understood what that sequence of commands is supposed to do. > 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. That's weird. It breaks on files with the same name? It unlikely the other file has the same contents. But suppose that went fine. Would cd elpa/packages/company && bzr merge git://... work after that? >> 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. Copying git log manually is exactly the kind of activity I'd like to avoid, hence the original question about merging. Not sure I understand the alternative (two extra prepositions there), but if it's just pasting Git commit hash into the message, that works for me. I already try to make corresponding version tags in the Git repo, though, so tracking which commit was merged last is not a problem. That aside, almost all of company-mode change history is missing in elpa, so when the transition to Git is done, there's no reason not to fully re-import the directory from the upstream repo.