From mboxrd@z Thu Jan  1 00:00:00 1970
From: Brian Wightman <MidLifeXis@wightmanfam.org>
Subject: Re: [PATCH] Add "Time-stamp: <>" in (first 8 lines of) export
 template
Date: Tue, 20 Mar 2012 10:58:39 -0500
Message-ID: <CALbR6203WywBoj6_9qG7B5v7yEbjG3YVj49B730yigincjPhYg@mail.gmail.com>
References: <80y5s2u8ix.fsf@somewhere.org> <87limvo5ki.fsf@gnu.org>
	<80ehsn1lvs.fsf@somewhere.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([208.118.235.92]:41136)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <btwightman@gmail.com>) id 1SA1Sh-0006kT-Co
	for emacs-orgmode@gnu.org; Tue, 20 Mar 2012 11:59:09 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <btwightman@gmail.com>) id 1SA1SN-0000wR-8k
	for emacs-orgmode@gnu.org; Tue, 20 Mar 2012 11:59:02 -0400
Received: from mail-yx0-f169.google.com ([209.85.213.169]:42947)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <btwightman@gmail.com>) id 1SA1SN-0000wB-2H
	for emacs-orgmode@gnu.org; Tue, 20 Mar 2012 11:58:43 -0400
Received: by yenm8 with SMTP id m8so241050yen.0
	for <emacs-orgmode@gnu.org>; Tue, 20 Mar 2012 08:58:40 -0700 (PDT)
In-Reply-To: <80ehsn1lvs.fsf@somewhere.org>
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: Sebastien Vauban <wxhgmqzgwmuf@spammotel.com>
Cc: emacs-orgmode@gnu.org

On Tue, Mar 20, 2012 at 7:45 AM, Sebastien Vauban
<wxhgmqzgwmuf@spammotel.com> wrote:
> Then, I can provide a patch with `time-stamp' function added to
> `before-save-hook' in Org mode.

I would lobby against this being the default template, as these time
stamps really mess up the ability to merge org files from multiple
branches without conflicts.

A ------- B ------- D
\                     /
 \--------C--------/

At the merge, D would have a conflict to resolve by hand.

I used timestamps and the save hook mentioned above for a while and
ended up needing to do unnecessary (and in the context of a rev
control like GIT - non-useful) manual conflict resolution, so have
since removed them from every file I had previously added them to.

Just my $0.02.

Brian
---
MidLifeXis@wightmanfam.org