[Orgmode] Re: [PATCH] added a new modeline face for tasks which have overrun their effort estimate

[Richard Riley]

Jan Böcker <address@hidden> 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.
> address@hidden
> http://lists.gnu.org/mailman/listinfo/emacs-orgmode
>

-- 
Google Talk : address@hidden  http://www.google.com/talk