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: extracting commits from Elpa to original repo Date: Sun, 21 Dec 2014 17:19:21 +0200 Message-ID: <86ppbdvxmu.fsf@yandex.ru> References: <87k31ld1e9.fsf@ericabrahamsen.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1419175208 24550 80.91.229.3 (21 Dec 2014 15:20:08 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 21 Dec 2014 15:20:08 +0000 (UTC) Cc: Stefan Monnier , emacs-devel@gnu.org To: Eric Abrahamsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Dec 21 16:20:01 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 1Y2iIY-0003ea-OG for ged-emacs-devel@m.gmane.org; Sun, 21 Dec 2014 16:19:58 +0100 Original-Received: from localhost ([::1]:37582 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y2iIX-0001RF-VM for ged-emacs-devel@m.gmane.org; Sun, 21 Dec 2014 10:19:57 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33776) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y2iIE-0001Qz-U6 for emacs-devel@gnu.org; Sun, 21 Dec 2014 10:19:44 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y2iI9-00065D-2j for emacs-devel@gnu.org; Sun, 21 Dec 2014 10:19:38 -0500 Original-Received: from mail-wg0-x229.google.com ([2a00:1450:400c:c00::229]:57221) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y2iI8-00062e-Ss for emacs-devel@gnu.org; Sun, 21 Dec 2014 10:19:33 -0500 Original-Received: by mail-wg0-f41.google.com with SMTP id y19so4934960wgg.14 for ; Sun, 21 Dec 2014 07:19:31 -0800 (PST) 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=axA5XOGAp5UgoLNQnxPEtYNQVWJM3Eqb4/8dD9VIVqc=; b=moeqbxLoVv4a1+e0DacV8ThtnNxHf2a5d9HDrQGc9US4SvDKzVDF9FtDAOx45o64Qf OTnH1W2v8najI8+RIPZqyv9Unv7r/H/LLVGQ2PBxA5pjmQ3DTUTuXbnNhtrbkKx6EsHg gm2kL90LcwzZkQeJjyvVpm4b3MXgilKRnajH8GvKQ6atR4EPzjq5xSoqnKspAkG2M8AL uuzntIA9gxiIEsDAeLm5KGkEi6pT/UeCDqjWmDz9DC1/q1dcyLzAUrV3+LteE87JUtEI DXL3HZD9LV12tdIpwA1GmJoUlCgWQVT/J9Cb8ZsMbDExMe8GLK08zie2fHpNkW8TzsjE GYxw== X-Received: by 10.194.52.37 with SMTP id q5mr32731659wjo.39.1419175171386; Sun, 21 Dec 2014 07:19:31 -0800 (PST) Original-Received: from axl ([82.102.93.54]) by mx.google.com with ESMTPSA id ly9sm20199732wjb.24.2014.12.21.07.19.27 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 21 Dec 2014 07:19:30 -0800 (PST) In-Reply-To: <87k31ld1e9.fsf@ericabrahamsen.net> (Eric Abrahamsen's message of "Sun, 21 Dec 2014 13:20:46 +0800") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c00::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:180429 Archived-At: Eric Abrahamsen writes: > I also used the "subtree split" command to create a separate branch > within Elpa containing only the commits made on "packages/gnorb". > > I'd like to get Stefan's patch into my general Gnorb repo, in such a way > that it doesn't create any conflicts or confusion the next time I pull > into Elpa. I created a patch for his commit, but it doesn't apply > cleanly to my other repo, and I suspect that fixing it up so that it > does will simply defer the mess. Why doesn't it? But anyway, you should fix it up and push, and then solve any conflicts that might arise in the next merge. The 'git subtree push' workflow described in the article you've linked to can work too, in certain cases, but IIUC it only works well if the separate repo was originally made from a split (otherwise you risk pushing the whole elpa history into the external repo).