From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eric Abrahamsen Newsgroups: gmane.emacs.devel Subject: Re: extracting commits from Elpa to original repo Date: Mon, 22 Dec 2014 09:41:11 +0800 Message-ID: <87y4q0bgw8.fsf@ericabrahamsen.net> References: <87k31ld1e9.fsf@ericabrahamsen.net> <86ppbdvxmu.fsf@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1419212156 11396 80.91.229.3 (22 Dec 2014 01:35:56 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 22 Dec 2014 01:35:56 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Dec 22 02:35:49 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 1Y2ruU-00010u-5L for ged-emacs-devel@m.gmane.org; Mon, 22 Dec 2014 02:35:46 +0100 Original-Received: from localhost ([::1]:38793 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y2ruT-0005vt-KY for ged-emacs-devel@m.gmane.org; Sun, 21 Dec 2014 20:35:45 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y2ruL-0005vk-9k for emacs-devel@gnu.org; Sun, 21 Dec 2014 20:35:43 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y2ruF-00020E-M9 for emacs-devel@gnu.org; Sun, 21 Dec 2014 20:35:37 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:42474) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y2ruF-000206-F7 for emacs-devel@gnu.org; Sun, 21 Dec 2014 20:35:31 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Y2ruC-0000lA-Ti for emacs-devel@gnu.org; Mon, 22 Dec 2014 02:35:29 +0100 Original-Received: from 123.123.16.212 ([123.123.16.212]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 22 Dec 2014 02:35:28 +0100 Original-Received: from eric by 123.123.16.212 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 22 Dec 2014 02:35:28 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 30 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 123.123.16.212 User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:Q73k2l7/xp2YpIN6MwyzbrnaKNI= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:180455 Archived-At: Dmitry Gutov writes: > 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. Because his patch was from a month ago, and many things have changed since then. Maybe a regular merge and push would end up okay. I just don't have that much confidence in my command of git. > 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). Which I nearly did yesterday! This seems like more work than it's worth -- I'll look into de-subtree-ing this package. Thanks, Eric