* git repo version clarificaiton
@ 2012-06-28 10:47 Daniel Hawthorne
2012-06-28 14:08 ` Nick Dokos
2012-06-28 20:05 ` Achim Gratz
0 siblings, 2 replies; 9+ messages in thread
From: Daniel Hawthorne @ 2012-06-28 10:47 UTC (permalink / raw)
To: emacs-orgmode
[-- Attachment #1: Type: text/plain, Size: 185 bytes --]
Hi,
As stated by the variable "org-version," the git repo version is 7.8.03.
The stable release is 7.8.11. Is the version number for the repo not
meaningful?
Best,
Daniel Hawthorne
[-- Attachment #2: Type: text/html, Size: 242 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: git repo version clarificaiton
2012-06-28 10:47 git repo version clarificaiton Daniel Hawthorne
@ 2012-06-28 14:08 ` Nick Dokos
2012-06-28 15:42 ` Tassilo Horn
2012-06-28 20:05 ` Achim Gratz
1 sibling, 1 reply; 9+ messages in thread
From: Nick Dokos @ 2012-06-28 14:08 UTC (permalink / raw)
To: Daniel Hawthorne; +Cc: emacs-orgmode
Daniel Hawthorne <djthorne@stanford.edu> wrote:
> As stated by the variable "org-version," the git repo version is 7.8.03.
> The stable release is 7.8.11. Is the version number for the repo not
> meaningful?
>
You probably have an out-of-date org-version.el[c]. You need to ``make
autoloads'' after pulling. That will remake org-version.el and
org-install.el to reflect reality.
Nick
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: git repo version clarificaiton
2012-06-28 14:08 ` Nick Dokos
@ 2012-06-28 15:42 ` Tassilo Horn
2012-06-28 16:11 ` Samuel Wales
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Tassilo Horn @ 2012-06-28 15:42 UTC (permalink / raw)
To: emacs-orgmode
Nick Dokos <nicholas.dokos@hp.com> writes:
Hi Nick,
>> As stated by the variable "org-version," the git repo version is
>> 7.8.03. The stable release is 7.8.11. Is the version number for the
>> repo not meaningful?
>
> You probably have an out-of-date org-version.el[c]. You need to
> ``make autoloads'' after pulling. That will remake org-version.el and
> org-install.el to reflect reality.
I think, it's still wrong. I can see that in commit
60587ea91cb42ae8618666c7dae5b029f751b913 Basien bumped the defconst
org-version to 7.8.11, but that doesn't exist anymore. And making clean
and recompiling everything still says
Org-mode version 7.8.10 (release_7.8.10-701-g054f99 @ /home/horn/Repos/el/org-mode/lisp/)
instead of 7.8.11.
Bye,
Tassilo
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: git repo version clarificaiton
2012-06-28 15:42 ` Tassilo Horn
@ 2012-06-28 16:11 ` Samuel Wales
2012-06-28 16:14 ` Nick Dokos
2012-06-28 16:18 ` Nick Dokos
2 siblings, 0 replies; 9+ messages in thread
From: Samuel Wales @ 2012-06-28 16:11 UTC (permalink / raw)
To: Tassilo Horn; +Cc: emacs-orgmode
Confirmed.
Jun 28 08:58 ./lisp/org-version.el
Version 7.8.10.
--
The Kafka Pandemic: http://thekafkapandemic.blogspot.com
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: git repo version clarificaiton
2012-06-28 15:42 ` Tassilo Horn
2012-06-28 16:11 ` Samuel Wales
@ 2012-06-28 16:14 ` Nick Dokos
2012-06-28 16:18 ` Nick Dokos
2 siblings, 0 replies; 9+ messages in thread
From: Nick Dokos @ 2012-06-28 16:14 UTC (permalink / raw)
To: Tassilo Horn; +Cc: emacs-orgmode
Tassilo Horn <tassilo@member.fsf.org> wrote:
> Nick Dokos <nicholas.dokos@hp.com> writes:
>
> Hi Nick,
>
> >> As stated by the variable "org-version," the git repo version is
> >> 7.8.03. The stable release is 7.8.11. Is the version number for the
> >> repo not meaningful?
> >
> > You probably have an out-of-date org-version.el[c]. You need to
> > ``make autoloads'' after pulling. That will remake org-version.el and
> > org-install.el to reflect reality.
>
> I think, it's still wrong. I can see that in commit
> 60587ea91cb42ae8618666c7dae5b029f751b913 Basien bumped the defconst
> org-version to 7.8.11, but that doesn't exist anymore. And making clean
> and recompiling everything still says
>
> Org-mode version 7.8.10 (release_7.8.10-701-g054f99 @ /home/horn/Repos/el/org-mode/lisp/)
>
> instead of 7.8.11.
>
Is this master or maint? On maint, I get
release_7.8.10-11-g5968047
On master, I get
release_7.8.11-89-gcf8d979
Nick
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: git repo version clarificaiton
2012-06-28 15:42 ` Tassilo Horn
2012-06-28 16:11 ` Samuel Wales
2012-06-28 16:14 ` Nick Dokos
@ 2012-06-28 16:18 ` Nick Dokos
2012-06-28 17:35 ` Tassilo Horn
2 siblings, 1 reply; 9+ messages in thread
From: Nick Dokos @ 2012-06-28 16:18 UTC (permalink / raw)
To: Tassilo Horn; +Cc: emacs-orgmode
Tassilo Horn <tassilo@member.fsf.org> wrote:
> Nick Dokos <nicholas.dokos@hp.com> writes:
>
> Hi Nick,
>
> >> As stated by the variable "org-version," the git repo version is
> >> 7.8.03. The stable release is 7.8.11. Is the version number for the
> >> repo not meaningful?
> >
> > You probably have an out-of-date org-version.el[c]. You need to
> > ``make autoloads'' after pulling. That will remake org-version.el and
> > org-install.el to reflect reality.
>
> I think, it's still wrong. I can see that in commit
> 60587ea91cb42ae8618666c7dae5b029f751b913 Basien bumped the defconst
> org-version to 7.8.11, but that doesn't exist anymore. And making clean
> and recompiling everything still says
>
> Org-mode version 7.8.10 (release_7.8.10-701-g054f99 @ /home/horn/Repos/el/org-mode/lisp/)
>
> instead of 7.8.11.
>
Oh, and as Achim pointed out, you probably need to do
git fetch --tags origin
Nick
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: git repo version clarificaiton
2012-06-28 16:18 ` Nick Dokos
@ 2012-06-28 17:35 ` Tassilo Horn
2012-06-28 18:25 ` Nick Dokos
0 siblings, 1 reply; 9+ messages in thread
From: Tassilo Horn @ 2012-06-28 17:35 UTC (permalink / raw)
To: nicholas.dokos; +Cc: emacs-orgmode
Nick Dokos <nicholas.dokos@hp.com> writes:
Hi Nick,
> Is this master or maint?
master
>> Org-mode version 7.8.10 (release_7.8.10-701-g054f99 @
>> /home/horn/Repos/el/org-mode/lisp/)
>>
>> instead of 7.8.11.
>
> Oh, and as Achim pointed out, you probably need to do
>
> git fetch --tags origin
Oh, yes, that does the trick. So the org version is constructed from
the latest tag in git?
Bye,
Tassilo
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: git repo version clarificaiton
2012-06-28 17:35 ` Tassilo Horn
@ 2012-06-28 18:25 ` Nick Dokos
0 siblings, 0 replies; 9+ messages in thread
From: Nick Dokos @ 2012-06-28 18:25 UTC (permalink / raw)
To: Tassilo Horn; +Cc: emacs-orgmode
Tassilo Horn <tassilo@member.fsf.org> wrote:
> Nick Dokos <nicholas.dokos@hp.com> writes:
>
> Hi Nick,
>
> > Is this master or maint?
>
> master
>
> >> Org-mode version 7.8.10 (release_7.8.10-701-g054f99 @
> >> /home/horn/Repos/el/org-mode/lisp/)
> >>
> >> instead of 7.8.11.
> >
> > Oh, and as Achim pointed out, you probably need to do
> >
> > git fetch --tags origin
>
> Oh, yes, that does the trick. So the org version is constructed from
> the latest tag in git?
>
When you ``make autoloads'', it runs ``git describe --abbrev=6 HEAD''
and uses the resulting string to create a new org-version.el file. That
file is then used from that point on. And yes, ``git describe''
calculates the name by counting how many commits past the latest
available tag there are (on the appropriate branch).
Nick
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: git repo version clarificaiton
2012-06-28 10:47 git repo version clarificaiton Daniel Hawthorne
2012-06-28 14:08 ` Nick Dokos
@ 2012-06-28 20:05 ` Achim Gratz
1 sibling, 0 replies; 9+ messages in thread
From: Achim Gratz @ 2012-06-28 20:05 UTC (permalink / raw)
To: emacs-orgmode
Daniel Hawthorne writes:
> As stated by the variable "org-version," the git repo version is
> 7.8.03.
Each checkout you make from the repo has it's own version. Now, if you
are shown version 7.8.03, it can mean several things: you really have
that version checked out (forgot to pull? on a different branch?) or
you may have a mixed install.
> The stable release is 7.8.11. Is the version number for the
> repo not meaningful?
It is. The above tells us that something is amiss with your org-mode
from Git. We just can't tell what exactly since you didn't give enough
information.
git remote update
git fetch --tags
git checkout master
git describe
Regards,
Achim.
--
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+
DIY Stuff:
http://Synth.Stromeko.net/DIY.html
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-06-28 20:05 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-06-28 10:47 git repo version clarificaiton Daniel Hawthorne
2012-06-28 14:08 ` Nick Dokos
2012-06-28 15:42 ` Tassilo Horn
2012-06-28 16:11 ` Samuel Wales
2012-06-28 16:14 ` Nick Dokos
2012-06-28 16:18 ` Nick Dokos
2012-06-28 17:35 ` Tassilo Horn
2012-06-28 18:25 ` Nick Dokos
2012-06-28 20:05 ` Achim Gratz
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).