From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ted Zlatanov Newsgroups: gmane.emacs.devel Subject: Re: extracting commits from Elpa to original repo Date: Wed, 24 Dec 2014 07:43:19 -0500 Organization: =?utf-8?B?0KLQtdC+0LTQvtGAINCX0LvQsNGC0LDQvdC+0LI=?= @ Cienfuegos Message-ID: References: <87k31ld1e9.fsf@ericabrahamsen.net> Reply-To: emacs-devel@gnu.org NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1419425042 7572 80.91.229.3 (24 Dec 2014 12:44:02 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 24 Dec 2014 12:44:02 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Dec 24 13:43:52 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 1Y3lI8-0004Pq-Eq for ged-emacs-devel@m.gmane.org; Wed, 24 Dec 2014 13:43:52 +0100 Original-Received: from localhost ([::1]:48108 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y3lI8-0006xT-1P for ged-emacs-devel@m.gmane.org; Wed, 24 Dec 2014 07:43:52 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45505) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y3lHt-0006vC-K3 for emacs-devel@gnu.org; Wed, 24 Dec 2014 07:43:38 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y3lHp-0002Nl-JO for emacs-devel@gnu.org; Wed, 24 Dec 2014 07:43:37 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:44379) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y3lHp-0002Nf-CR for emacs-devel@gnu.org; Wed, 24 Dec 2014 07:43:33 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Y3lHn-0004Jl-MN for emacs-devel@gnu.org; Wed, 24 Dec 2014 13:43:31 +0100 Original-Received: from 50.153.236.5 ([50.153.236.5]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 24 Dec 2014 13:43:31 +0100 Original-Received: from tzz by 50.153.236.5 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 24 Dec 2014 13:43:31 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 28 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 50.153.236.5 X-Face: bd.DQ~'29fIs`T_%O%C\g%6jW)yi[zuz6; d4V0`@y-~$#3P_Ng{@m+e4o<4P'#(_GJQ%TT= D}[Ep*b!\e,fBZ'j_+#"Ps?s2!4H2-Y"sx" Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (darwin) Cancel-Lock: sha1:Zdo2ncGsqGMEedFRMsduq3fsG98= 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:180638 Archived-At: On Sun, 21 Dec 2014 13:20:46 +0800 Eric Abrahamsen wrote: EA> I'd like to get Stefan's patch into my general Gnorb repo, in such a way EA> that it doesn't create any conflicts or confusion the next time I pull EA> into Elpa. I created a patch for his commit, but it doesn't apply EA> cleanly to my other repo, and I suspect that fixing it up so that it EA> does will simply defer the mess. I'll admit I've reached the limit of my EA> git abilities. EA> Can anyone provide some advice on what to do in this situation? Besides EA> "develop your next package directly in the Elpa tree"? So you basically want Stefan's patch to end up on your side with the same commit ID, so you can merge back and forth (preserving a 1-to-1 relationship between the two sides). From the `git subtree' docs for the "split" sub-operation: Repeated splits of exactly the same history are guaranteed to be identical (i.e. to produce the same commit ids). Because of this, if you add new commits and then re-split, the new commits will be attached as commits on top of the history you generated last time, so 'git merge' and friends will work as expected. IOW, don't import the commit as a patch, but use `git subtree' to synchronize. I hope that helps. Ted