From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nick Dokos Subject: Re: Agenda items refer to the wrong headline Date: Wed, 09 Apr 2014 23:24:32 -0400 Message-ID: <87fvllkgsv.fsf@gmail.com> References: <87y4zggeb8.fsf@gmail.com> <87lhvfgnto.fsf@gmail.com> <87r456sj9a.fsf@alphaville.bos.redhat.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:33549) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WY5bi-0005di-Nv for emacs-orgmode@gnu.org; Wed, 09 Apr 2014 23:25:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WY5bb-0000HW-7B for emacs-orgmode@gnu.org; Wed, 09 Apr 2014 23:24:54 -0400 Received: from plane.gmane.org ([80.91.229.3]:58238) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WY5bb-0000HP-0f for emacs-orgmode@gnu.org; Wed, 09 Apr 2014 23:24:47 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1WY5bZ-0005MP-OI for emacs-orgmode@gnu.org; Thu, 10 Apr 2014 05:24:45 +0200 Received: from pool-98-110-160-12.bstnma.fios.verizon.net ([98.110.160.12]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 10 Apr 2014 05:24:45 +0200 Received: from ndokos by pool-98-110-160-12.bstnma.fios.verizon.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 10 Apr 2014 05:24:45 +0200 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: emacs-orgmode@gnu.org 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