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: extracting commits from Elpa to original repo Date: Sun, 21 Dec 2014 13:20:46 +0800 Message-ID: <87k31ld1e9.fsf@ericabrahamsen.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1419138950 9639 80.91.229.3 (21 Dec 2014 05:15:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 21 Dec 2014 05:15:50 +0000 (UTC) Cc: Stefan Monnier To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Dec 21 06:15:44 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 1Y2Yrm-0008Rk-4R for ged-emacs-devel@m.gmane.org; Sun, 21 Dec 2014 06:15:42 +0100 Original-Received: from localhost ([::1]:36522 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y2Yrl-0007TG-Fo for ged-emacs-devel@m.gmane.org; Sun, 21 Dec 2014 00:15:41 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46052) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y2YrK-0007I6-Jr for emacs-devel@gnu.org; Sun, 21 Dec 2014 00:15:20 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y2YrE-0005gl-Az for emacs-devel@gnu.org; Sun, 21 Dec 2014 00:15:14 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:36653) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y2YrE-0005gN-4S for emacs-devel@gnu.org; Sun, 21 Dec 2014 00:15:08 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Y2YrC-00087D-AM for emacs-devel@gnu.org; Sun, 21 Dec 2014 06:15:06 +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 ; Sun, 21 Dec 2014 06:15:06 +0100 Original-Received: from eric by 123.123.16.212 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 21 Dec 2014 06:15:06 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 44 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:EkkjMfDxzUBbFkwR/c4fI3TFNWk= 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:180413 Archived-At: Here's another addressed-to-stefan-but-probably-of-general-interest question: I first put my "Gnorb" package into Elpa using the git subtree approach. Stefan made a commit into it, fixing up some compilation issues and code style stuff. When I went to pull my latest changes into Elpa I got conflicts (I wasn't expecting anyone else to be committing into that package!), assumed I'd screwed something up, backed out about half the changes, and didn't figure out what had happened until after I'd pushed again. I keep Gnorb in a separate repo which I consider its home. I have added that repo to my local Elpa repo as a remote, and have been pulling changes from there into the Elpa repo. Stefan you made another similar commit a month or so ago (which I appreciate!), which I'd like to have in my main repo, but now I'm not sure how to handle it. Here's what I do in Elpa to get my changes: git fetch gnorb git subtree pull --prefix=packages/gnorb gnorb master --squash (I've been using the instructions found here[1]) 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. I'll admit I've reached the limit of my git abilities. Can anyone provide some advice on what to do in this situation? Besides "develop your next package directly in the Elpa tree"? Thanks in advance, Eric [1]: https://hpc.uni.lu/blog/2014/understanding-git-subtree/