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 screwup Date: Tue, 22 Apr 2014 05:25:04 +0400 Message-ID: <87bnvup34f.fsf@yandex.ru> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1398130288 3978 80.91.229.3 (22 Apr 2014 01:31:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 22 Apr 2014 01:31:28 +0000 (UTC) Cc: emacs-devel@gnu.org To: Leo Liu Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 22 03:31:21 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 1WcPYP-0004mH-2w for ged-emacs-devel@m.gmane.org; Tue, 22 Apr 2014 03:31:21 +0200 Original-Received: from localhost ([::1]:52304 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcPYO-0002V4-NB for ged-emacs-devel@m.gmane.org; Mon, 21 Apr 2014 21:31:20 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33415) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcPYC-00029G-Cr for emacs-devel@gnu.org; Mon, 21 Apr 2014 21:31:17 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WcPY3-00011B-CS for emacs-devel@gnu.org; Mon, 21 Apr 2014 21:31:08 -0400 Original-Received: from mail-la0-x22a.google.com ([2a00:1450:4010:c03::22a]:55230) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcPY3-00010p-4K for emacs-devel@gnu.org; Mon, 21 Apr 2014 21:30:59 -0400 Original-Received: by mail-la0-f42.google.com with SMTP id el20so343054lab.1 for ; Mon, 21 Apr 2014 18:30:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; bh=hf3llPtNglxqD50LDbLJhFpz8gnMnSq8UEU6w6x3dgs=; b=FDtrwxRlhXMVgwTFL60JL2XG8nDIsMA7sU0fNR8SB2MEBE0mzFrjxwmp33f4OxMGga FvKAkM74ZxPhfBKO6zvXq3wUlGg1BAcQNJWPzQR0w6j5iGoxUqtA6/tuy7rfloRUIDB4 5Sh0ebOcgpSCB3C5pmRm3hC1KvC57P80hkGQBHE9HevtxVu4DZC9DlESkbGKpJ1oXSyx YUAgvAnXDozxxF5yW2u+Uit8W9YiMUePDy5GeqO6yS5c64ds2A5x3K6kYNKQi7fLcmO/ E8I/hrhm082TFjz6HV/Q+8iwuzsHo1ukiH/920HTlGW0HkEXSzBHXyjhIQ0CV+XNHJoq 6yzQ== X-Received: by 10.112.234.167 with SMTP id uf7mr34453lbc.66.1398129907450; Mon, 21 Apr 2014 18:25:07 -0700 (PDT) Original-Received: from axl ([178.252.98.87]) by mx.google.com with ESMTPSA id d4sm39080708lbr.27.2014.04.21.18.25.05 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 21 Apr 2014 18:25:06 -0700 (PDT) In-Reply-To: (Leo Liu's message of "Tue, 22 Apr 2014 08:42:38 +0800") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.90 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::22a 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:171554 Archived-At: Leo Liu writes: > Just now merging easy-kill updates into ELPA somehow all files are > merged into elpa/admin overriding things there. That's weird. I wonder how you perform the merges. > How could I fix this? (It seems cannot reset HEAD to before my push). 'git revert 6e73bbb -m 1' seems to be what you're looking for. Although maybe we'd prefer someone with admin access to force push the result of 'git reset --hard a1fe7f0'.