From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Leo Liu Newsgroups: gmane.emacs.devel Subject: Re: ELPA screwup Date: Tue, 22 Apr 2014 23:56:02 +0800 Message-ID: References: <87bnvup34f.fsf@yandex.ru> <87y4yx4olv.fsf@zigzag.favinet> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1398182644 14138 80.91.229.3 (22 Apr 2014 16:04:04 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 22 Apr 2014 16:04:04 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 22 18:03:58 2014 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 1WcdAq-0006x2-OH for ged-emacs-devel@m.gmane.org; Tue, 22 Apr 2014 18:03:56 +0200 Original-Received: from localhost ([::1]:56049 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcdAq-0002iL-41 for ged-emacs-devel@m.gmane.org; Tue, 22 Apr 2014 12:03:56 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39814) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcdAe-0002XA-Aa for emacs-devel@gnu.org; Tue, 22 Apr 2014 12:03:53 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WcdAV-0006jF-Ak for emacs-devel@gnu.org; Tue, 22 Apr 2014 12:03:44 -0400 Original-Received: from mail-pb0-x229.google.com ([2607:f8b0:400e:c01::229]:46054) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcdAV-0006jA-2h for emacs-devel@gnu.org; Tue, 22 Apr 2014 12:03:35 -0400 Original-Received: by mail-pb0-f41.google.com with SMTP id jt11so5145518pbb.28 for ; Tue, 22 Apr 2014 09:03:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:references:face:date:in-reply-to:message-id :user-agent:mime-version:content-type; bh=vEf3kXYLXt6Fp3JjwTIbKbCoYf9ZS7L9S2aER7kceP4=; b=Pz3GpfZIK28l62MVxnGM2HZzRcwBP7phILoloYhsHDyX1yo73gi7EaTDdqi7OSltHZ KQcMBjbwj+BEJhwmnlX1Cdks7xrSCMHgMKeFEyaYVi3WVGWEsAs30dtGAvRbT1L0I5ls Q/lOgLfuofON9Ih37Fna0zOCGhANhwiSEF816t9XmU/3x/+MqGfdjRb55to5o2sx+paf uK46j3PMvq5VZmm7W4/F2YqCBxw0/+TQQ6Yz5KUM0eHztwdHQK+Z0IGf4PwsxZ+mXoaX SuciOTrkX2STIPMIUBhrCkXGaP47EjG/MhifFbNshgF3RtEhFiuh0RjipfeA4EwQnp90 ACbA== X-Received: by 10.66.189.226 with SMTP id gl2mr45098438pac.65.1398182170569; Tue, 22 Apr 2014 08:56:10 -0700 (PDT) Original-Received: from fortuna ([221.217.233.136]) by mx.google.com with ESMTPSA id gg3sm85749444pbc.34.2014.04.22.08.56.07 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Tue, 22 Apr 2014 08:56:10 -0700 (PDT) Face: iVBORw0KGgoAAAANSUhEUgAAACkAAAApAQAAAACAGz1bAAABKElEQVQYlWNg3NIt5FDPUPt7 4+X79Qyucz5/ugik+L2PBgKpyphaIK921q23QDnG0NBQoMr/vaWl9f8ZLL78uPv5PwN7RETfzXoG jhmFz27XM0RXmpuY/WfY+fv0Mc56BvFybfXA/wwL5t/wF61n2PU59axXPcOVzbmSW/8zrNt1benC /ww70hqUU/4zKCtrT9jwn8FhwynbufUMendE2aLqGRpdX9al1zM8eh17lKeeQcTMrdD5P8P3j/YT Q/8zXHSb7p1Qz/C4OM2JuZ7hgtI7K6AjqsMnf8j4z8C6xG1tw3+GqpqvsVn/GTzmpD9j/8/wP/oZ S/l/Bka+QO/g/wy15ueeFQL9N1O8mPU/g+umV3t1gdT0/1bTgHLqYVeXAlWKpMWt+w8Az82C9nHf X0cAAAAASUVORK5CYII= In-Reply-To: <87y4yx4olv.fsf@zigzag.favinet> (Thien-Thi Nguyen's message of "Tue, 22 Apr 2014 12:58:52 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.50 (CentOS 6.5) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c01::229 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:171580 Archived-At: On 2014-04-22 12:58 +0200, Thien-Thi Nguyen wrote: > I'm no Git expert and would like to avoid trouble in the future. > Could you please summarize what happened, including the commands > issued? I have easy-kill as a remote on the elpa repo and this morning I ran 'git pull -s subtree easy-kill master' and pushed. The same command that worked previously somehow managed to merge changes into the admin/ directory. It seems the best option to correct this is to reset head to before the merge and do the subtree merge right. The second best option (which is what I did) seems to be git mv things to the right subdirectory and restore deleted files if any. Leo