From mboxrd@z Thu Jan 1 00:00:00 1970 From: Richard Riley Subject: Re: [PATCH] added a new modeline face for tasks which have overrun their effort estimate Date: Wed, 20 Jan 2010 07:43:16 +0100 Message-ID: References: <4b56672b.0305560a.53c2.ffffcdc0@mx.google.com> <4B56A08E.70703@jboecker.de> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NXUJ0-0000qo-N2 for emacs-orgmode@gnu.org; Wed, 20 Jan 2010 01:44:42 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NXUIv-0000o8-CO for emacs-orgmode@gnu.org; Wed, 20 Jan 2010 01:44:41 -0500 Received: from [199.232.76.173] (port=42144 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NXUIv-0000o4-66 for emacs-orgmode@gnu.org; Wed, 20 Jan 2010 01:44:37 -0500 Received: from mx20.gnu.org ([199.232.41.8]:42397) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NXUIu-0007sv-Ol for emacs-orgmode@gnu.org; Wed, 20 Jan 2010 01:44:36 -0500 Received: from lo.gmane.org ([80.91.229.12]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NXUIt-0007a4-VS for emacs-orgmode@gnu.org; Wed, 20 Jan 2010 01:44:36 -0500 Received: from list by lo.gmane.org with local (Exim 4.50) id 1NXUIK-0001fF-Nj for emacs-orgmode@gnu.org; Wed, 20 Jan 2010 07:44:00 +0100 Received: from 85.183.18.158 ([85.183.18.158]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 20 Jan 2010 07:44:00 +0100 Received: from rileyrgdev by 85.183.18.158 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 20 Jan 2010 07:44:00 +0100 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org Jan Böcker writes: > On 20.01.2010 06:22, Richard Riley wrote: >> >> I believe I now have a repo set up that can be pulled from. Not sure if >> its done the correct way since I didnt clone org-mode. Rather I pushed >> my clone master and then the overrun branch. I *think* that should be >> ok. >> >> Anyway, the URL is >> >> http://repo.or.cz/w/rgr-org-mode.git >> >> and the branch with patch is called "overrun". > > That is the URL to the web interface, which cannot be pulled from. > The correct URL to clone/pull from is: > > git://repo.or.cz/rgr-org-mode.git Yes, I realised that - it is listed on the web page - I kind of figured people would want to see the (now defunct) "octopus" graphically before adding this as a remote ;) > >> Sorry about the octopus >> at the head of overrun - you will note that I didnt set my email >> properly and all hell broke loose as I tried to reset the head and .... > > The cool thing about git is that it lets you fix this :) > I see that you have committed the same patch three times with a > different email address and/or commit message. What you want to do is to > delete two of these commits. Yes, I had thought my git repo clone would inherit my top level git user settings but it didnt seem to. Possibly global not set. On my list to now check. > > Enter git rebase --interactive, which allows you to rewrite history. > Let's do this on a new branch, because rewriting history that others > have already pulled can break things for them: > > $ git checkout overrun > $ git checkout -b overrun-fixed > > We want to modify HEAD and the two commits before that: > > $ git rebase -i HEAD~2 What I did (before I saw this) was to reset to HEAD~2, the do a commit and a force push. Worked well. Git rebase is now on my list to review! There are so many ways to do the same thing. > > You are now dropped into a text editor. Each line in the file you edit > represents one commit. To drop a commit, simply delete the line (or > comment it out). I assume that you want to keep commit 34b13cb... with > the gmail address, so you would comment out the other two lines: > > # pick 09f2e0e added a new modeline face for tasks which have... > pick 34b13cb added new face for task modeline clock for when... > # pick da65d04 added a new modeline face for tasks which have... > > Then save the file and exit the editor. > If everything succeeded, git rebase should say: > Successfully rebased and updated refs/heads/overrun-fixed. > > Start gitk and take a look at your new, tidy overrun-fixed branch. > > If something goes wrong, you can abort the rebase with: > $ git rebase --abort > > I cannot comment on the patch itself, as I am new to elisp myself and > have never done anything with faces or mode-lines. Many thanks for the feedback. Was quite hairy for a while. For some reason my new repo wouldnt acept a push for about half an hour after I created it. At least I dont think I did anything to suddenly make it work. But seems fine now. > > _______________________________________________ > Emacs-orgmode mailing list > Please use `Reply All' to send replies to the list. > Emacs-orgmode@gnu.org > http://lists.gnu.org/mailman/listinfo/emacs-orgmode > -- Google Talk : rileyrgdev@googlemail.com http://www.google.com/talk