From mboxrd@z Thu Jan 1 00:00:00 1970 From: Fletcher Charest Subject: Re: Agenda items refer to the wrong headline Date: Mon, 14 Apr 2014 18:24:54 +0200 Message-ID: References: <87y4zggeb8.fsf@gmail.com> <87lhvfgnto.fsf@gmail.com> <87r456sj9a.fsf@alphaville.bos.redhat.com> <87fvllkgsv.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=001a11c37ea0aa2a6904f7031f0d Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:43703) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WZjgo-0005KR-Ni for emacs-orgmode@gnu.org; Mon, 14 Apr 2014 12:24:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WZjgn-0003ea-2T for emacs-orgmode@gnu.org; Mon, 14 Apr 2014 12:24:58 -0400 Received: from mail-we0-x22a.google.com ([2a00:1450:400c:c03::22a]:49302) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WZjgm-0003eG-Nx for emacs-orgmode@gnu.org; Mon, 14 Apr 2014 12:24:56 -0400 Received: by mail-we0-f170.google.com with SMTP id w61so8377489wes.29 for ; Mon, 14 Apr 2014 09:24:55 -0700 (PDT) In-Reply-To: <87fvllkgsv.fsf@gmail.com> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Nick Dokos Cc: emacs-orgmode@gnu.org --001a11c37ea0aa2a6904f7031f0d Content-Type: text/plain; charset=UTF-8 Hi Nick, I would like to thank you, since your message made me curious about git, and I started using it. After reading a little bit, I was able to install it, clone the org repository and revert the commit we were talking about (that feels good). I can now use Org normally again. I just hope it's not a very bad thing to do. FC On Thu, Apr 10, 2014 at 5:24 AM, Nick Dokos wrote: > Fletcher Charest writes: > > > Nick, you say you could not reproduce the bug using version > > 8.2.5h-667-g971dc4, but you did with version 8.2.5h-888-g798bb8d. Just > > out of curiosity: does the '888' in '8.2.5h-888-g798bb8d' is a number > > that is incremented chronologically? If this is correct (I'm not > > familiar with this at all), FWIW, the bug was not caused only by the > > patch '8.2.5h-888-g798bb8d', since I observed it also with version > > 8.2.5h-94-g91175a. > > > > 888 is the number of commits since the commit that was tagged > '8.2.5h'. Unfortunately, that number can be misleading: in the > face of merges, there may be multiple paths that lead from some commit > back to the tagged commit (run `gitk master' if you want to see the > multiple > paths), so the "number of commits since the tag" is ambiguous. It is > only unambiguous if the history is strictly linear. > > If you do `git log --oneline -100' on master, you'll see that there is a > merge commit d25846b that looks like this: > > ,---- > | $ git show d25846b > | commit d25846b2340e32dea93fc89ea432f74a7f64d950 > | Merge: f261833 91175a3 > | Author: Nicolas Goaziou > | Date: Sat Mar 29 15:02:10 2014 +0100 > | > | Merge branch 'maint' > `---- > > The merge commit has two parents: f261833 and our old friend 91175a3. > > Try git describe on this commit: > > git describe d25846b > > It's only one commit ahead of 91175a3 but I get > > release_8.2.5h-873-gd25846b > > so it's 873 commits ahead of 8.2.5h, not 95! But that's because `git > describe' takes a different, much longer, path back to the tagged > commit: it follows the first parent of the merge commit. > > So I'm pretty sure that the patch that the bisection fingered is > indeed the culprit. > > I believe this is correct but if not, Achim will correct me:-) > > -- > Nick > > > --001a11c37ea0aa2a6904f7031f0d Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi Nick,

I would like to thank you, since your= message made me curious about git, and I started using it. After reading a= little bit, I was able to install it, clone the org repository and revert = the commit we were talking about (that feels good). I can now use Org norma= lly again. I just hope it's not a very bad thing to do.

FC


On Thu, Apr 10, 2014 at 5:24 AM, Nick Dokos <= ndokos@gmail.com&= gt; wrote:
Fletcher Charest <fletcher.charest@gmail.com> w= rites:

> Nick, you say you could not reproduce the bug using version
> 8.2.5h-667-g971dc4, but you did with version 8.2.5h-888-g798bb8d. Just=
> out of curiosity: does the '888' in '8.2.5h-888-g798bb8d&#= 39; is a number
> that is incremented chronologically? If this is correct (I'm not > familiar with this at all), FWIW, the bug was not caused only by the > patch '8.2.5h-888-g798bb8d', since I observed it also with ver= sion
> 8.2.5h-94-g91175a.
>

888 is the number of commits since the commit that was tagged
'8.2.5h'. Unfortunately, that number can be misleading: in the
face of merges, there may be multiple paths that lead from some commit
back to the tagged commit (run `gitk master' if you want to see the mul= tiple
paths), so the "number of commits since the tag" is ambiguous. It= is
only unambiguous if the history is strictly linear.

If you do `git log --oneline -100' on master, you'll see that there= is a
merge commit d25846b that looks like this:

,----
| $ git show d25846b
| commit d25846b2340e32dea93fc89ea432f74a7f64d950
| Merge: f261833 91175a3
| Author: Nicolas Goaziou <n.goaz= iou@gmail.com>
| Date: =C2=A0 Sat Mar 29 15:02:10 2014 +0100
|
| =C2=A0 =C2=A0 Merge branch 'maint'
`----

The merge commit has two parents: f261833 and our old friend 91175a3.

Try git describe on this commit:

=C2=A0 =C2=A0git describe d25846b

It's only one commit ahead of 91175a3 but I get

=C2=A0 =C2=A0release_8.2.5h-873-gd25846b

so it's 873 commits ahead of 8.2.5h, not 95! But that's because `gi= t
describe' takes a different, much longer, path back to the tagged
commit: it follows the first parent of the merge commit.

So I'm pretty sure that the patch that the bisection fingered is
indeed the culprit.

I believe this is correct but if not, Achim will correct me:-)

--
Nick



--001a11c37ea0aa2a6904f7031f0d--