From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jarmo Hurri <jarmo.hurri@syk.fi>
Subject: Re: Make errors from a fresh git clone
Date: Sun, 23 Sep 2012 17:52:24 +0300
Message-ID: <873928hjvb.fsf@syk.fi>
References: <87pq5d7y3z.fsf@syk.fi> <87obkw95ju.fsf@Rainer.invalid>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([208.118.235.92]:42753)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1TFnXw-0001d9-Hx
	for emacs-orgmode@gnu.org; Sun, 23 Sep 2012 10:52:37 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1TFnXv-0004Hh-C3
	for emacs-orgmode@gnu.org; Sun, 23 Sep 2012 10:52:36 -0400
Received: from plane.gmane.org ([80.91.229.3]:39504)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1TFnXv-0004HZ-5E
	for emacs-orgmode@gnu.org; Sun, 23 Sep 2012 10:52:35 -0400
Received: from list by plane.gmane.org with local (Exim 4.69)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1TFnXx-0007fr-Ha
	for emacs-orgmode@gnu.org; Sun, 23 Sep 2012 16:52:37 +0200
Received: from cs181237063.pp.htv.fi ([82.181.237.63])
	by main.gmane.org with esmtp (Gmexim 0.1 (Debian))
	id 1AlnuQ-0007hv-00
	for <emacs-orgmode@gnu.org>; Sun, 23 Sep 2012 16:52:37 +0200
Received: from jarmo.hurri by cs181237063.pp.htv.fi with local (Gmexim 0.1
	(Debian)) id 1AlnuQ-0007hv-00
	for <emacs-orgmode@gnu.org>; Sun, 23 Sep 2012 16:52:37 +0200
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=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

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