From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/83294 Path: news.gmane.org!not-for-mail From: Steinar Bang Newsgroups: gmane.emacs.gnus.general Subject: Re: iCalendar support: reply to invitations, sync to org Date: Fri, 07 Jun 2013 15:37:54 +0200 Organization: Probably a good idea Message-ID: References: <5n5x2r38v8y3nk.fsf@nb-jtatarik2.xing.hh> <87d2ub63e0.fsf@randomsample.de> <87obbjtgls.fsf@lifelogs.com> <87k3m7i2v5.fsf@randomsample.de> <8738svt9ih.fsf@lifelogs.com> <87fvwvhzw4.fsf@randomsample.de> <87d2rzrtmb.fsf@lifelogs.com> <5n5x2rtxlbgdom.fsf@nb-jtatarik2.xing.hh> <5n5x2rwqq6f7a0.fsf@nb-jtatarik2.xing.hh> <871u8ert3n.fsf@lifelogs.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1370612384 30146 80.91.229.3 (7 Jun 2013 13:39:44 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 7 Jun 2013 13:39:44 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M31560@lists.math.uh.edu Fri Jun 07 15:39:43 2013 Return-path: Envelope-to: ding-account@gmane.org Original-Received: from util0.math.uh.edu ([129.7.128.18]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UkwtJ-00081H-82 for ding-account@gmane.org; Fri, 07 Jun 2013 15:39:41 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu) by util0.math.uh.edu with smtp (Exim 4.63) (envelope-from ) id 1Ukwrw-0002dY-VC; Fri, 07 Jun 2013 08:38:17 -0500 Original-Received: from mx2.math.uh.edu ([129.7.128.33]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1Ukwrv-0002dK-LC for ding@lists.math.uh.edu; Fri, 07 Jun 2013 08:38:15 -0500 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx2.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1Ukwrq-0002o0-Do for ding@lists.math.uh.edu; Fri, 07 Jun 2013 08:38:15 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]) by quimby.gnus.org with esmtp (Exim 4.72) (envelope-from ) id 1Ukwro-0005xY-Fd for ding@gnus.org; Fri, 07 Jun 2013 15:38:08 +0200 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Ukwrk-0006dA-DN for ding@gnus.org; Fri, 07 Jun 2013 15:38:04 +0200 Original-Received: from steria10.steria.no ([195.204.41.10]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 07 Jun 2013 15:38:04 +0200 Original-Received: from sb by steria10.steria.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 07 Jun 2013 15:38:04 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: ding@gnus.org Original-Lines: 35 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: steria10.steria.no Mail-Copies-To: never User-Agent: Gnus/5.130008 (Ma Gnus v0.8) Emacs/24.3 (windows-nt) Cancel-Lock: sha1:BILgE3cldMsAgVJ0S85lLnYB3l4= X-Spam-Score: -2.4 (--) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:83294 Archived-At: > On Fri, 07 Jun 2013 14:13:27 +0200 Jan Tatarik wrote: JT> If it makes the merge process easier, I will simply clone the original JT> repo instead of the emacsmirror one, and continue development against JT> that. You don't have to clone the original repo, I think...? The first thing I would have tried, is something like this: - Preserve any outstanding changes you might have git stash (recover afterwards with "git stash pop") - Add the Gnus git repo as a remote and fetch its content git remote add gnus-repo http://git.gnus.org/gnus.git git fetch gnus-repo - Check out the Gnus master branch and test merge your changes against this branch git checkout -b gnus-master --track gnus-repo/master git merge --no-ff --no-commit origin/icalendar Then you inspect the working directory with eg. magit (recommended!) and check that what's in there are just your diffs. Next step then would be to merge in the current Gnus master into your branch: - First clear out the results from the merge git reset --hard gnus-repo/master - Then merge the Gnus master HEAD into your branch git merge gnus-repo/master - Build clean and test the Gnus After this, your icalendar branch is up to date with Gnus master, and any merges from your branch into Gnus master should be problem free (ie. you won't have to re-merge before submitting... unless they completely reorganize the Gnus directory structure in the meantime).