* Agenda items refer to the wrong headline
@ 2014-04-06 4:23 Fletcher Charest
2014-04-08 11:53 ` Fletcher Charest
2014-04-08 13:07 ` Nick Dokos
0 siblings, 2 replies; 14+ messages in thread
From: Fletcher Charest @ 2014-04-06 4:23 UTC (permalink / raw)
To: emacs-orgmode
[-- Attachment #1.1: Type: text/plain, Size: 1450 bytes --]
Dear all,
I am confronted to a weird issue with the agenda. I would like to know if
you can reproduce this bug. First of all, my emacs-version is:
GNU Emacs 24.3.1 (i386-mingw-nt5.1.2600) of 2013-03-17 on MARVIN
I installed Org using ELPA (org repository), my org-version is:
Org-mode version 8.2.5h (8.2.5h-94-g91175a-elpaplus @
~/.emacs.d/elpa/org-plus-contrib-20140331/)
For this test, Org was the only package installed outside vanilla Emacs
packages. I have no problem with the version of Org bundled with my Emacs
(which is Org-mode version 7.9.3f (release_7.9.3f-17-g7524ef @ c:/Program
Files/Emacs 24.3/lisp/org/). I do not load my init.el file.
For the test I used a simple Org file:
* TODO task 1 :pro:
SCHEDULED: <2014-04-01 mar.>
* TODO task 2 :perso:
SCHEDULED: <2014-04-02 mer.>
Then, I displayed the agenda for this file, and filtered it for the 'perso'
tag using '/'. I attached the output for reference.
The problem is that some tasks in the agenda refers to the wrong headlines
in the main file. This is more obvious when activating follow mode: for
example, if I put the cursor on the line marked '1' in the attached file,
it refers to line '2' in the main file, which is the wrong line. This is
obviously a bug, and of course very problematic.
Can you reproduce this?! I hope I provided every possible piece of
information.
Thank you for your feedback,
FC
[-- Attachment #1.2: Type: text/html, Size: 1738 bytes --]
[-- Attachment #2: org.png --]
[-- Type: image/png, Size: 19052 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Agenda items refer to the wrong headline
2014-04-06 4:23 Agenda items refer to the wrong headline Fletcher Charest
@ 2014-04-08 11:53 ` Fletcher Charest
2014-04-17 0:32 ` Bastien
2014-04-08 13:07 ` Nick Dokos
1 sibling, 1 reply; 14+ messages in thread
From: Fletcher Charest @ 2014-04-08 11:53 UTC (permalink / raw)
To: emacs-orgmode
[-- Attachment #1: Type: text/plain, Size: 2014 bytes --]
Dear all,
This (in my opinion) serious bug still appears when using the last ELPA
version of Org (8.2.5h-98-g0820d0-elpa @ ~/.emacs.d/elpa/org-20140407/) on
Windows with GNU Emacs 24.3.1.
I also tried that on my Debian system, with GNU Emacs 24.3.1. No problem
with Org 7.9.3, but the same bug appears as soon as I upgrade Org to the
last ELPA version. Again, nothing loaded except vanilla Emacs.
FC
On Sun, Apr 6, 2014 at 6:23 AM, Fletcher Charest <fletcher.charest@gmail.com
> wrote:
> Dear all,
>
> I am confronted to a weird issue with the agenda. I would like to know if
> you can reproduce this bug. First of all, my emacs-version is:
>
> GNU Emacs 24.3.1 (i386-mingw-nt5.1.2600) of 2013-03-17 on MARVIN
>
> I installed Org using ELPA (org repository), my org-version is:
>
> Org-mode version 8.2.5h (8.2.5h-94-g91175a-elpaplus @
> ~/.emacs.d/elpa/org-plus-contrib-20140331/)
>
> For this test, Org was the only package installed outside vanilla Emacs
> packages. I have no problem with the version of Org bundled with my Emacs
> (which is Org-mode version 7.9.3f (release_7.9.3f-17-g7524ef @ c:/Program
> Files/Emacs 24.3/lisp/org/). I do not load my init.el file.
>
> For the test I used a simple Org file:
>
> * TODO task 1 :pro:
> SCHEDULED: <2014-04-01 mar.>
> * TODO task 2 :perso:
> SCHEDULED: <2014-04-02 mer.>
>
> Then, I displayed the agenda for this file, and filtered it for the
> 'perso' tag using '/'. I attached the output for reference.
>
> The problem is that some tasks in the agenda refers to the wrong headlines
> in the main file. This is more obvious when activating follow mode: for
> example, if I put the cursor on the line marked '1' in the attached file,
> it refers to line '2' in the main file, which is the wrong line. This is
> obviously a bug, and of course very problematic.
>
> Can you reproduce this?! I hope I provided every possible piece of
> information.
>
> Thank you for your feedback,
>
> FC
>
>
>
[-- Attachment #2: Type: text/html, Size: 2580 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Agenda items refer to the wrong headline
2014-04-06 4:23 Agenda items refer to the wrong headline Fletcher Charest
2014-04-08 11:53 ` Fletcher Charest
@ 2014-04-08 13:07 ` Nick Dokos
2014-04-08 20:45 ` Fletcher Charest
` (2 more replies)
1 sibling, 3 replies; 14+ messages in thread
From: Nick Dokos @ 2014-04-08 13:07 UTC (permalink / raw)
To: emacs-orgmode
Fletcher Charest <fletcher.charest@gmail.com> writes:
> Dear all,
>
> I am confronted to a weird issue with the agenda. I would like to know if you can reproduce this bug. First of all, my emacs-version is:
>
> GNU Emacs 24.3.1 (i386-mingw-nt5.1.2600) of 2013-03-17 on MARVIN
>
> I installed Org using ELPA (org repository), my org-version is:
>
> Org-mode version 8.2.5h (8.2.5h-94-g91175a-elpaplus @ ~/.emacs.d/elpa/org-plus-contrib-20140331/)
>
> For this test, Org was the only package installed outside vanilla Emacs packages. I have no problem with the version of Org bundled with my Emacs (which is Org-mode version 7.9.3f
> (release_7.9.3f-17-g7524ef @ c:/Program Files/Emacs 24.3/lisp/org/). I do not load my init.el file.
>
> For the test I used a simple Org file:
>
> * TODO task 1 :pro:
> SCHEDULED: <2014-04-01 mar.>
> * TODO task 2 :perso:
> SCHEDULED: <2014-04-02 mer.>
>
> Then, I displayed the agenda for this file, and filtered it for the 'perso' tag using '/'. I attached the output for reference.
>
> The problem is that some tasks in the agenda refers to the wrong headlines in the main file. This is more obvious when activating follow mode: for example, if I put the cursor on the
> line marked '1' in the attached file, it refers to line '2' in the main file, which is the wrong line. This is obviously a bug, and of course very problematic.
>
> Can you reproduce this?! I hope I provided every possible piece of information.
>
I tried a bit and I couldn't reproduce it. The agenda
lines are properly linked to the file lines afaict in this version:
Org-mode version 8.2.5h (release_8.2.5h-667-g971dc4 @ /home/nick/elisp/org-mode/lisp/)
GNU Emacs 24.3.50.2 (x86_64-unknown-linux-gnu, GTK+ Version 2.24.10) of
2013-07-14
But I *did* reproduce it with latest:
Org-mode version 8.2.5h (release_8.2.5h-888-g798bb8 @
/home/nick/src/emacs/org/org-mode/lisp/)
I did 'emacs -q -l /path/to/minimal.el' and then
got an agenda, put it in follow mode, searched for the perso
tag and went to that entry:
C-c a a F / <TAB> perso <RET> n
and got the wrong line in the main file. The minimal.el is as follows:
--8<---------------cut here---------------start------------->8---
;;; -*- mode: emacs-lisp -*-
(add-to-list 'load-path (expand-file-name "~/src/emacs/org/org-mode/lisp"))
(add-to-list 'auto-mode-alist '("\\.\\(org\\|org_archive\\|txt\\)$" . org-mode))
(require 'org-loaddefs)
(setq debug-on-error t)
(setq debug-on-quit t)
(setq eval-expression-print-length nil)
(setq eval-expression-print-level nil)
(global-set-key "\C-cl" 'org-store-link)
(global-set-key "\C-ca" 'org-agenda)
(setq org-agenda-files '("~/src/org/fletcher-charest-agenda.org"))
--8<---------------cut here---------------end--------------->8---
and the agenda file ~/src/org/fletcher-charest-agenda.org is
--8<---------------cut here---------------start------------->8---
* TODO task 1 :pro:
SCHEDULED: <2014-04-01 mar.>
* TODO task 2 :perso:
SCHEDULED: <2014-04-02 mer.>
Org-mode version 8.2.5h (release_8.2.5h-888-g798bb8 @ /home/nick/src/emacs/org/org-mode/lisp/)
--8<---------------cut here---------------end--------------->8---
--
Nick
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: Agenda items refer to the wrong headline
2014-04-08 13:07 ` Nick Dokos
@ 2014-04-08 20:45 ` Fletcher Charest
2014-04-09 3:54 ` Nick Dokos
2014-04-10 3:33 ` Samuel Wales
2014-04-16 19:05 ` Bastien
2 siblings, 1 reply; 14+ messages in thread
From: Fletcher Charest @ 2014-04-08 20:45 UTC (permalink / raw)
To: Nick Dokos; +Cc: emacs-orgmode
[-- Attachment #1: Type: text/plain, Size: 3699 bytes --]
Hello,
Thank you Nick for trying, and for confirming this behaviour.
Do I need to take further action at this point, or just wait? In any case
I'm available to investigate the bug further.
FC
On Tue, Apr 8, 2014 at 3:07 PM, Nick Dokos <ndokos@gmail.com> wrote:
> Fletcher Charest <fletcher.charest@gmail.com> writes:
>
> > Dear all,
> >
> > I am confronted to a weird issue with the agenda. I would like to know
> if you can reproduce this bug. First of all, my emacs-version is:
> >
> > GNU Emacs 24.3.1 (i386-mingw-nt5.1.2600) of 2013-03-17 on MARVIN
> >
> > I installed Org using ELPA (org repository), my org-version is:
> >
> > Org-mode version 8.2.5h (8.2.5h-94-g91175a-elpaplus @
> ~/.emacs.d/elpa/org-plus-contrib-20140331/)
> >
> > For this test, Org was the only package installed outside vanilla Emacs
> packages. I have no problem with the version of Org bundled with my Emacs
> (which is Org-mode version 7.9.3f
> > (release_7.9.3f-17-g7524ef @ c:/Program Files/Emacs 24.3/lisp/org/). I
> do not load my init.el file.
> >
> > For the test I used a simple Org file:
> >
> > * TODO task 1 :pro:
> > SCHEDULED: <2014-04-01 mar.>
> > * TODO task 2 :perso:
> > SCHEDULED: <2014-04-02 mer.>
> >
> > Then, I displayed the agenda for this file, and filtered it for the
> 'perso' tag using '/'. I attached the output for reference.
> >
> > The problem is that some tasks in the agenda refers to the wrong
> headlines in the main file. This is more obvious when activating follow
> mode: for example, if I put the cursor on the
> > line marked '1' in the attached file, it refers to line '2' in the main
> file, which is the wrong line. This is obviously a bug, and of course very
> problematic.
> >
> > Can you reproduce this?! I hope I provided every possible piece of
> information.
> >
>
> I tried a bit and I couldn't reproduce it. The agenda
> lines are properly linked to the file lines afaict in this version:
>
> Org-mode version 8.2.5h (release_8.2.5h-667-g971dc4 @
> /home/nick/elisp/org-mode/lisp/)
> GNU Emacs 24.3.50.2 (x86_64-unknown-linux-gnu, GTK+ Version 2.24.10) of
> 2013-07-14
>
> But I *did* reproduce it with latest:
> Org-mode version 8.2.5h (release_8.2.5h-888-g798bb8 @
> /home/nick/src/emacs/org/org-mode/lisp/)
>
> I did 'emacs -q -l /path/to/minimal.el' and then
> got an agenda, put it in follow mode, searched for the perso
> tag and went to that entry:
>
> C-c a a F / <TAB> perso <RET> n
>
> and got the wrong line in the main file. The minimal.el is as follows:
>
> --8<---------------cut here---------------start------------->8---
> ;;; -*- mode: emacs-lisp -*-
>
> (add-to-list 'load-path (expand-file-name "~/src/emacs/org/org-mode/lisp"))
>
> (add-to-list 'auto-mode-alist '("\\.\\(org\\|org_archive\\|txt\\)$" .
> org-mode))
>
> (require 'org-loaddefs)
>
> (setq debug-on-error t)
> (setq debug-on-quit t)
> (setq eval-expression-print-length nil)
> (setq eval-expression-print-level nil)
>
> (global-set-key "\C-cl" 'org-store-link)
> (global-set-key "\C-ca" 'org-agenda)
>
> (setq org-agenda-files '("~/src/org/fletcher-charest-agenda.org"))
> --8<---------------cut here---------------end--------------->8---
>
>
> and the agenda file ~/src/org/fletcher-charest-agenda.org is
>
> --8<---------------cut here---------------start------------->8---
> * TODO task 1
> :pro:
> SCHEDULED: <2014-04-01 mar.>
> * TODO task 2
> :perso:
> SCHEDULED: <2014-04-02 mer.>
> Org-mode version 8.2.5h (release_8.2.5h-888-g798bb8 @
> /home/nick/src/emacs/org/org-mode/lisp/)
> --8<---------------cut here---------------end--------------->8---
>
> --
> Nick
>
>
>
[-- Attachment #2: Type: text/html, Size: 4964 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: Agenda items refer to the wrong headline
2014-04-08 20:45 ` Fletcher Charest
@ 2014-04-09 3:54 ` Nick Dokos
2014-04-09 13:52 ` Nick Dokos
0 siblings, 1 reply; 14+ messages in thread
From: Nick Dokos @ 2014-04-09 3:54 UTC (permalink / raw)
To: emacs-orgmode
Fletcher Charest <fletcher.charest@gmail.com> writes:
> Hello,
>
> Thank you Nick for trying, and for confirming this behaviour.
>
> Do I need to take further action at this point, or just wait? In any case I'm available to investigate the bug further.
>
I did a git bisect and came up with this:
,----
| 3559ff84b244dae2109131507804b21126e0b07c is the first bad commit
| commit 3559ff84b244dae2109131507804b21126e0b07c
| Author: Bastien Guerry <bzg@altern.org>
| Date: Thu Mar 20 17:07:03 2014 +0100
|
| org-agenda.el: Fix bug when using `org-agenda-do-date-later' in filtered agendas
|
| * org-agenda.el (org-agenda-filter-hide-line): Hide from the
| beginning of the line to the beginning of the next line.
| (org-agenda-show-new-time): Use `move-beginning-of-line' and
| `move-end-of-line'.
| (org-agenda-drag-line-forward): Adapt to the new definition of
| hidden filtered lines.
|
| Thanks to Igor Sosa Mayor for reporting this bug and to Nick Dokos
| and Matt Lundin for providing further information.
|
| :040000 040000 dd6879dbb07b53a05b4b9f179f5969824cd7aab5 38ee4da60a939adbf0c69cc46470c5d9b9e99b19 M lisp
`----
Starting from release_8.2.5h-888-g798bb8d (this was latest as of this
morning) and reverting the above commit fixes Fletcher's problem.
Bastien, can you please take another look?
Thanks.
> FC
>
> On Tue, Apr 8, 2014 at 3:07 PM, Nick Dokos <ndokos@gmail.com> wrote:
>
> Fletcher Charest <fletcher.charest@gmail.com> writes:
>
> > Dear all,
> >
> > I am confronted to a weird issue with the agenda. I would like to know if you can reproduce this bug. First of all, my emacs-version is:
> >
> > GNU Emacs 24.3.1 (i386-mingw-nt5.1.2600) of 2013-03-17 on MARVIN
> >
> > I installed Org using ELPA (org repository), my org-version is:
> >
> > Org-mode version 8.2.5h (8.2.5h-94-g91175a-elpaplus @ ~/.emacs.d/elpa/org-plus-contrib-20140331/)
> >
> > For this test, Org was the only package installed outside vanilla Emacs packages. I have no problem with the version of Org bundled with my Emacs (which is Org-mode version
> 7.9.3f
> > (release_7.9.3f-17-g7524ef @ c:/Program Files/Emacs 24.3/lisp/org/). I do not load my init.el file.
> >
> > For the test I used a simple Org file:
> >
> > * TODO task 1 :pro:
> > SCHEDULED: <2014-04-01 mar.>
> > * TODO task 2 :perso:
> > SCHEDULED: <2014-04-02 mer.>
> >
> > Then, I displayed the agenda for this file, and filtered it for the 'perso' tag using '/'. I attached the output for reference.
> >
> > The problem is that some tasks in the agenda refers to the wrong headlines in the main file. This is more obvious when activating follow mode: for example, if I put the cursor
> on the
> > line marked '1' in the attached file, it refers to line '2' in the main file, which is the wrong line. This is obviously a bug, and of course very problematic.
> >
> > Can you reproduce this?! I hope I provided every possible piece of information.
> >
>
> I tried a bit and I couldn't reproduce it. The agenda
> lines are properly linked to the file lines afaict in this version:
>
> Org-mode version 8.2.5h (release_8.2.5h-667-g971dc4 @ /home/nick/elisp/org-mode/lisp/)
> GNU Emacs 24.3.50.2 (x86_64-unknown-linux-gnu, GTK+ Version 2.24.10) of
> 2013-07-14
>
> But I *did* reproduce it with latest:
> Org-mode version 8.2.5h (release_8.2.5h-888-g798bb8 @
> /home/nick/src/emacs/org/org-mode/lisp/)
>
> I did 'emacs -q -l /path/to/minimal.el' and then
> got an agenda, put it in follow mode, searched for the perso
> tag and went to that entry:
>
> C-c a a F / <TAB> perso <RET> n
>
> and got the wrong line in the main file. The minimal.el is as follows:
>
> --8<---------------cut here---------------start------------->8---
> ;;; -*- mode: emacs-lisp -*-
>
> (add-to-list 'load-path (expand-file-name "~/src/emacs/org/org-mode/lisp"))
>
> (add-to-list 'auto-mode-alist '("\\.\\(org\\|org_archive\\|txt\\)$" . org-mode))
>
> (require 'org-loaddefs)
>
> (setq debug-on-error t)
> (setq debug-on-quit t)
> (setq eval-expression-print-length nil)
> (setq eval-expression-print-level nil)
>
> (global-set-key "\C-cl" 'org-store-link)
> (global-set-key "\C-ca" 'org-agenda)
>
> (setq org-agenda-files '("~/src/org/fletcher-charest-agenda.org"))
> --8<---------------cut here---------------end--------------->8---
>
> and the agenda file ~/src/org/fletcher-charest-agenda.org is
>
> --8<---------------cut here---------------start------------->8---
> * TODO task 1 :pro:
> SCHEDULED: <2014-04-01 mar.>
> * TODO task 2 :perso:
> SCHEDULED: <2014-04-02 mer.>
> Org-mode version 8.2.5h (release_8.2.5h-888-g798bb8 @ /home/nick/src/emacs/org/org-mode/lisp/)
> --8<---------------cut here---------------end--------------->8---
>
> --
> Nick
>
--
Nick
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: Agenda items refer to the wrong headline
2014-04-09 3:54 ` Nick Dokos
@ 2014-04-09 13:52 ` Nick Dokos
2014-04-09 14:36 ` Fletcher Charest
0 siblings, 1 reply; 14+ messages in thread
From: Nick Dokos @ 2014-04-09 13:52 UTC (permalink / raw)
To: emacs-orgmode
Nick Dokos <ndokos@gmail.com> writes:
>
> Starting from release_8.2.5h-888-g798bb8d (this was latest as of this
> morning) and reverting the above commit fixes Fletcher's problem.
>
Just to be clear: I'm *not* advocating that the commit be reverted.
I used the revert just to confirm that something in that patch caused
the problem that Fletcher observed.
Nick
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Agenda items refer to the wrong headline
2014-04-09 13:52 ` Nick Dokos
@ 2014-04-09 14:36 ` Fletcher Charest
2014-04-10 3:24 ` Nick Dokos
0 siblings, 1 reply; 14+ messages in thread
From: Fletcher Charest @ 2014-04-09 14:36 UTC (permalink / raw)
To: Nick Dokos; +Cc: emacs-orgmode
[-- Attachment #1: Type: text/plain, Size: 888 bytes --]
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.
FC
On Wed, Apr 9, 2014 at 3:52 PM, Nick Dokos <ndokos@gmail.com> wrote:
> Nick Dokos <ndokos@gmail.com> writes:
>
> >
> > Starting from release_8.2.5h-888-g798bb8d (this was latest as of this
> > morning) and reverting the above commit fixes Fletcher's problem.
> >
>
> Just to be clear: I'm *not* advocating that the commit be reverted.
> I used the revert just to confirm that something in that patch caused
> the problem that Fletcher observed.
>
> Nick
>
>
>
[-- Attachment #2: Type: text/html, Size: 1432 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Agenda items refer to the wrong headline
2014-04-09 14:36 ` Fletcher Charest
@ 2014-04-10 3:24 ` Nick Dokos
2014-04-14 16:24 ` Fletcher Charest
0 siblings, 1 reply; 14+ messages in thread
From: Nick Dokos @ 2014-04-10 3:24 UTC (permalink / raw)
To: emacs-orgmode
Fletcher Charest <fletcher.charest@gmail.com> 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 <n.goaziou@gmail.com>
| 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
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Agenda items refer to the wrong headline
2014-04-10 3:24 ` Nick Dokos
@ 2014-04-14 16:24 ` Fletcher Charest
0 siblings, 0 replies; 14+ messages in thread
From: Fletcher Charest @ 2014-04-14 16:24 UTC (permalink / raw)
To: Nick Dokos; +Cc: emacs-orgmode
[-- Attachment #1: Type: text/plain, Size: 2298 bytes --]
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 <ndokos@gmail.com> wrote:
> Fletcher Charest <fletcher.charest@gmail.com> 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 <n.goaziou@gmail.com>
> | 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
>
>
>
[-- Attachment #2: Type: text/html, Size: 3097 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Agenda items refer to the wrong headline
2014-04-08 13:07 ` Nick Dokos
2014-04-08 20:45 ` Fletcher Charest
@ 2014-04-10 3:33 ` Samuel Wales
2014-04-16 19:05 ` Bastien
2 siblings, 0 replies; 14+ messages in thread
From: Samuel Wales @ 2014-04-10 3:33 UTC (permalink / raw)
To: Nick Dokos; +Cc: emacs-orgmode
getting out of sync is possible even with non-buggy code. i wonder if
it would make sense to do a quick and dirty comparison of the headline
to error if it is different?
feel free to disregard if this is not a good idea.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Agenda items refer to the wrong headline
2014-04-08 13:07 ` Nick Dokos
2014-04-08 20:45 ` Fletcher Charest
2014-04-10 3:33 ` Samuel Wales
@ 2014-04-16 19:05 ` Bastien
2014-04-16 22:37 ` Bastien
2014-04-17 0:33 ` Bastien
2 siblings, 2 replies; 14+ messages in thread
From: Bastien @ 2014-04-16 19:05 UTC (permalink / raw)
To: Nick Dokos; +Cc: emacs-orgmode
Hi Nick,
Nick Dokos <ndokos@gmail.com> writes:
> But I *did* reproduce it with latest:
I reproduced the bug too, and it's pretty bad.
Thanks for the recipe, and thanks to Florian for
reporting this.
I'm busy right now but this is top priority.
--
Bastien
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2014-04-17 0:34 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-06 4:23 Agenda items refer to the wrong headline Fletcher Charest
2014-04-08 11:53 ` Fletcher Charest
2014-04-17 0:32 ` Bastien
2014-04-08 13:07 ` Nick Dokos
2014-04-08 20:45 ` Fletcher Charest
2014-04-09 3:54 ` Nick Dokos
2014-04-09 13:52 ` Nick Dokos
2014-04-09 14:36 ` Fletcher Charest
2014-04-10 3:24 ` Nick Dokos
2014-04-14 16:24 ` Fletcher Charest
2014-04-10 3:33 ` Samuel Wales
2014-04-16 19:05 ` Bastien
2014-04-16 22:37 ` Bastien
2014-04-17 0:33 ` Bastien
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).