From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Engster <deng@randomsample.de>
Subject: Re: org-caldav feedback
Date: Wed, 23 Jan 2013 21:23:53 +0100
Message-ID: <87622ny7fq.fsf@engster.org>
References: <CAPaq-gM97iOO8siF0RijHxe6Q7+Q3kO+syGzQHugmjCVEtSh4g@mail.gmail.com>
	<87wqvb1vh4.fsf@engster.org>
	<CAPaq-gPwJvpxQMcfGPKH_fpwSq+hZ58O1eWwk5fN3CgL=5baHw@mail.gmail.com>
	<87obgi2v9t.fsf@engster.org>
	<CAPaq-gOW8d8nDqvyNGwtSmd7=rM2ZKD_dG-eHdzwt-F-SR1GUA@mail.gmail.com>
	<87fw1u2pdp.fsf@engster.org>
	<CAPaq-gP65LR0NcHsiy4ChYsNwjEnOUBWZ65BNZ6B6Eo_Q0TCng@mail.gmail.com>
	<87boch2dik.fsf@engster.org> <8738xsa16n.fsf@ucl.ac.uk>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([208.118.235.92]:47348)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <deng@randomsample.de>) id 1Ty6rZ-0000Fe-0I
	for emacs-orgmode@gnu.org; Wed, 23 Jan 2013 15:24:02 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <deng@randomsample.de>) id 1Ty6rX-0006me-Qw
	for emacs-orgmode@gnu.org; Wed, 23 Jan 2013 15:24:00 -0500
Received: from randomsample.de ([83.169.19.17]:56570)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <deng@randomsample.de>) id 1Ty6rX-0006mX-Hb
	for emacs-orgmode@gnu.org; Wed, 23 Jan 2013 15:23:59 -0500
Received: from dslc-082-083-042-050.pools.arcor-ip.net ([82.83.42.50]
	helo=spaten)
	by randomsample.de with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16)
	(Exim 4.72) (envelope-from <deng@randomsample.de>)
	id 1Ty6rV-0000Q9-31
	for emacs-orgmode@gnu.org; Wed, 23 Jan 2013 21:23:57 +0100
In-Reply-To: <8738xsa16n.fsf@ucl.ac.uk> (Eric S. Fraga's message of "Wed, 23
	Jan 2013 16:30:32 +1030")
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: Org Mode Mailing List <emacs-orgmode@gnu.org>

Eric S. Fraga writes:
> I've had to clear out the org-caldav-xxx.el file in .emacs.d a couple
> of times but that's typically due to my doing things on the same entry
> in both calendar systems (org and Google).

If you change an item in Org as well as in the Calendar, the calendar
entry should simply get overwritten with the change you did in Org. So
while this "Org always wins" strategy doesn't qualify as proper conflict
handling, I still wonder why you had to restart from scratch?

Anyway, this is a temporary issue; I will add proper conflict handling
in the coming weeks.

-David