From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/83291 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 13:43:09 +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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1370605509 18773 80.91.229.3 (7 Jun 2013 11:45:09 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 7 Jun 2013 11:45:09 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M31557@lists.math.uh.edu Fri Jun 07 13:45:09 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 1Ukv6T-00089Y-4I for ding-account@gmane.org; Fri, 07 Jun 2013 13:45:09 +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 1Ukv4u-00025O-Ic; Fri, 07 Jun 2013 06:43:32 -0500 Original-Received: from mx1.math.uh.edu ([129.7.128.32]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1Ukv4r-000258-Lh for ding@lists.math.uh.edu; Fri, 07 Jun 2013 06:43:29 -0500 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx1.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1Ukv4m-0007iU-Qg for ding@lists.math.uh.edu; Fri, 07 Jun 2013 06:43:29 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]) by quimby.gnus.org with esmtp (Exim 4.72) (envelope-from ) id 1Ukv4k-00037W-QA for ding@gnus.org; Fri, 07 Jun 2013 13:43:22 +0200 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Ukv4f-0006Yq-UR for ding@gnus.org; Fri, 07 Jun 2013 13:43:17 +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 13:43:17 +0200 Original-Received: from sb by steria10.steria.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 07 Jun 2013 13:43:17 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: ding@gnus.org Original-Lines: 46 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:dCxzQugA+/o/HjwW/Iko5NYztF0= X-Spam-Score: -2.4 (--) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:83291 Archived-At: >>>>> Jan Tatarik : > I'm trying to whip it into shape for inclusion, the current effort is at > https://github.com/jtatarik/gnus/blob/icalendar/lisp/gnus-icalendar.el Note that since this repo is structured like the gnus repo itself, it should be possible to merge this in with full history. The reason I say "should be" instead of "is", is that the icalendar repo seems to come from something called "emacsmirror", rather than the gnus repo https://github.com/jtatarik/gnus/network I'm guessing that emacsmirror is a git repo shadowing the emacs bzr repo...? If it had been from the gnus repo, the process from a Gnus committer's POV, would have been: git remote add jtatarik-gnus https://github.com/jtatarik/gnus.git git fetch jtatarik-gnus Then move to the head of master (which will be the gnus master branch): git checkout master git pull --ff-only And then git merge --no-ff --no-commit jtatarik-gnus/icalendar and then inspect the modified files in the working directory and if the changes look ok (just the icalendar.el file added, and the file added to the configuration) then complete the commit with git commmit (--no-commit makes it stop before the commit, and --no-ff is probably not necessary here: it creates a commit even when the merge is a fast forward operation in the master branch) If the merge results look bad, they can be cleared out of the working directory with git reset --hard origin/master (which is a somewhat dangerous command. Check that you are on master before doing it, and that you don't have any outstanding changes that are not part of the merge, because they will all be cleaned away by the reset) In any case it is simple to just try doing this merge and see what the results are.