From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/83624 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, 02 Aug 2013 15:25:51 +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> <5n5x2r8v0lfdu5.fsf@nb-jtatarik2.xing.hh> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1375449985 29956 80.91.229.3 (2 Aug 2013 13:26:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 2 Aug 2013 13:26:25 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M31880=ding+2Daccount=gmane.org@lists.math.uh.edu Fri Aug 02 15:26:27 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 1V5FN5-00037R-4x for ding-account@gmane.org; Fri, 02 Aug 2013 15:26:19 +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 1V5FN4-0000cU-Gm for ding-account@gmane.org; Fri, 02 Aug 2013 08:26:18 -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 1V5FN3-0000cP-LO for ding@lists.math.uh.edu; Fri, 02 Aug 2013 08:26:17 -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 1V5FMz-00088l-HB for ding@lists.math.uh.edu; Fri, 02 Aug 2013 08:26:17 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]) by quimby.gnus.org with esmtp (Exim 4.72) (envelope-from ) id 1V5FMy-0001WQ-5n for ding@gnus.org; Fri, 02 Aug 2013 15:26:12 +0200 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1V5FMs-0002ZX-8t for ding@gnus.org; Fri, 02 Aug 2013 15:26:06 +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, 02 Aug 2013 15:26:06 +0200 Original-Received: from sb by steria10.steria.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 02 Aug 2013 15:26:06 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: ding@gnus.org Original-Lines: 59 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:Pxg8KDZua+AC7OfxLuJ70MWsIMk= X-Spam-Score: -3.4 (---) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:83624 Archived-At: >>>>> Lars Magne Ingebrigtsen : > I just added it as a new file. The other options looked way too > complicated for someone who knows nothing about git. I.e., me. Ok. What made it complicated was that it was cloned from the "wrong repository". But if the files are the exact same in the two repositories (or at least: share commits in their history where they hade the exact same SHA1) a merge should/could be possible. I wrote some suggestions in nntp://news.gmane.org/gmane.emacs.gnus.general/83294 http://permalink.gmane.org/gmane.emacs.gnus.general/83294 But those were directed at the author of the the iCalendar support. Ie. an attempt to merge in the current gnus git development into his repository. If he had been successful in doing so, you could easily have merged in his changes into gnus git master. But even without that change to the iCalendar support git repo in place (it isn't in place) you could have tried a merge of his branch into your master in the following way: 1. stash all of your local uncommitted changes git stash 2. add the iCalendar support repo git remote add jtatarik-gnus https://github.com/jtatarik/gnus.git git fetch jtatarik-gnus 3. go to master HEAD git checkout master git pull 4. do a merge that stops before creating a commit git merge --no-ff --no-commit jtatarik-gnus/master 5. examine the outstanding changes in your working directory (I prefer using magit for this `M-x magit-status RET') - If you only have lisp/gnus-icalendar.el as added as the only change, you're good, and can just complete the merge with git commit Future merges from the jtatarik repo should be problem free, and can be done with git fetch jtatarik-gnus git merge jtatarik-gnus/master (though I always prefer the "--no-ff --no-commit" behaviour when merging in others' changes) - If you see a lot of unrelated changes in the merge, you can get back on track with: git checkout origin/master . git checkout jtatarik-gnus/master lisp/gnus-icalendar.el git commit (this takes all files in the form they appear on the gnus git master, except for gnus-icalendar.el which is taken from Jans repo and will keep its entire commit history from there) Future merges after this should be problem free, using the same commands as above, unless Jan changes some other files outside of gnus-icalendar.el (eg. by doing a merge with the repo he originally cloned from. But if so, you can get back on track with the same trick as above) 6. Recover your stashed uncommitted changes git stash pop