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: Wed, 03 Apr 2013 13:32:36 -0400 Message-ID: References: <514E5164.9090901@yandex.ru> <515032F0.7060301@yandex.ru> <51566B13.2000708@gmail.com> <515725B5.20509@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1365010367 10828 80.91.229.3 (3 Apr 2013 17:32:47 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 3 Apr 2013 17:32:47 +0000 (UTC) Cc: emacs-devel To: Dmitry Gutov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 03 19:33:14 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 1UNRYf-0001Kr-FK for ged-emacs-devel@m.gmane.org; Wed, 03 Apr 2013 19:33:13 +0200 Original-Received: from localhost ([::1]:58912 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNRYG-00079f-Nz for ged-emacs-devel@m.gmane.org; Wed, 03 Apr 2013 13:32:48 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:47770) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNRYA-00073o-Ha for emacs-devel@gnu.org; Wed, 03 Apr 2013 13:32:46 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UNRY8-0007uD-2u for emacs-devel@gnu.org; Wed, 03 Apr 2013 13:32:42 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.182]:5251) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNRY7-0007tQ-VE for emacs-devel@gnu.org; Wed, 03 Apr 2013 13:32:40 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av4EABK/CFFFxLSu/2dsb2JhbABEvw4Xc4IeAQEEAVYjBQsLDiYSFBgNJIgeBsEtkQoDpHqBXoMT X-IPAS-Result: Av4EABK/CFFFxLSu/2dsb2JhbABEvw4Xc4IeAQEEAVYjBQsLDiYSFBgNJIgeBsEtkQoDpHqBXoMT X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="6397319" 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; 03 Apr 2013 13:32:34 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id E8E7267A1E; Wed, 3 Apr 2013 13:32:36 -0400 (EDT) In-Reply-To: <515725B5.20509@yandex.ru> (Dmitry Gutov's message of "Sat, 30 Mar 2013 21:49:41 +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:158607 Archived-At: > But suppose that went fine. Would cd elpa/packages/company && bzr merge > git://... work after that? Yes (modulo spurious conflicts when a file is added to that git branch, since the "bzr mv" we did before the "bzr split" only affects the file that existed back then). > Not sure I understand the alternative (two extra prepositions there), but Sorry about "the the" it should read "least the". > if it's just pasting Git commit hash into the message, that works for me. Yes, just adding that hash is what I meant. It is the least amount of info from which the rest can be reconstructed. > 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. Agreed. Stefan