* Make errors from a fresh git clone
@ 2012-09-23 11:54 Jarmo Hurri
2012-09-23 14:28 ` Achim Gratz
0 siblings, 1 reply; 5+ messages in thread
From: Jarmo Hurri @ 2012-09-23 11:54 UTC (permalink / raw)
To: emacs-orgmode
Greetings.
I am getting a bunch of make errors (20 failed files) when trying to
make the newest git version. This is from a clean git clone. The errors
are all of the same form; two examples below:
Compiling /home/jarmo/src/org/org-mode/lisp/org-ascii.el...
In toplevel form:
org-ascii.el:29:1:Error: Invalid read syntax: ")"
Compiling /home/jarmo/src/org/org-mode/lisp/org-beamer.el...
In toplevel form:
org-beamer.el:32:1:Error: Invalid read syntax: ")"
Any ideas of what might be going wrong?
--
Jarmo
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Make errors from a fresh git clone
2012-09-23 11:54 Make errors from a fresh git clone Jarmo Hurri
@ 2012-09-23 14:28 ` Achim Gratz
2012-09-23 14:52 ` Jarmo Hurri
2012-09-23 15:23 ` Bastien
0 siblings, 2 replies; 5+ messages in thread
From: Achim Gratz @ 2012-09-23 14:28 UTC (permalink / raw)
To: emacs-orgmode
Jarmo Hurri writes:
> Any ideas of what might be going wrong?
Bastien committed a merge conflict in org-agenda. I've pushed up a fix,
but it should probably be reviewed again.
For further reports, please say what branch and commit you're on.
Regards,
Achim.
--
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+
Factory and User Sound Singles for Waldorf Blofeld:
http://Synth.Stromeko.net/Downloads.html#WaldorfSounds
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Make errors from a fresh git clone
2012-09-23 14:28 ` Achim Gratz
@ 2012-09-23 14:52 ` Jarmo Hurri
2012-09-23 15:24 ` Bastien
2012-09-23 15:23 ` Bastien
1 sibling, 1 reply; 5+ messages in thread
From: Jarmo Hurri @ 2012-09-23 14:52 UTC (permalink / raw)
To: emacs-orgmode
Achim Gratz <Stromeko@nexgo.de> writes:
> Jarmo Hurri writes:
>> Any ideas of what might be going wrong?
>
> Bastien committed a merge conflict in org-agenda. I've pushed up a
> fix, but it should probably be reviewed again.
Ok, it compiles now. Thanks!
I thought the decription "fresh git clone" would specify where I was:
master and latest revision.
sh-4.2$ git status
# On branch master
nothing to commit (working directory clean)
sh-4.2$ git describe
release_7.9.1-314-g998e556
sh-4.2$ git log -2
commit 998e5565c4043702a5f583236b0db22bd526dcb4
Author: Achim Gratz <Stromeko@Stromeko.DE>
Date: Sun Sep 23 16:27:25 2012 +0200
Fix merge conflict in org-agenda.el
* lisp/org-agenda.el: Merge conflict due to additional parameters in
both maint and master resolved.
Needs review!
commit ed991f49d7f5d27664ff09ae19e6b7e9690edbfb
Merge: a14948c 5a29711
Author: Bastien Guerry <bzg@altern.org>
Date: Sun Sep 23 12:01:05 2012 +0200
Merge branch 'maint'
--
Jarmo
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: Make errors from a fresh git clone
2012-09-23 14:28 ` Achim Gratz
2012-09-23 14:52 ` Jarmo Hurri
@ 2012-09-23 15:23 ` Bastien
1 sibling, 0 replies; 5+ messages in thread
From: Bastien @ 2012-09-23 15:23 UTC (permalink / raw)
To: Achim Gratz; +Cc: emacs-orgmode
Achim Gratz <Stromeko@nexgo.de> writes:
> Jarmo Hurri writes:
>> Any ideas of what might be going wrong?
>
> Bastien committed a merge conflict in org-agenda. I've pushed up a fix,
> but it should probably be reviewed again.
Sorry I overlooked this one and thanks for fixing it!
--
Bastien
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-09-23 15:24 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-23 11:54 Make errors from a fresh git clone Jarmo Hurri
2012-09-23 14:28 ` Achim Gratz
2012-09-23 14:52 ` Jarmo Hurri
2012-09-23 15:24 ` Bastien
2012-09-23 15:23 ` 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).