emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
* [PATCH] Add "Time-stamp: <>" in (first 8 lines of) export template
@ 2012-02-16 15:01 Sebastien Vauban
  2012-03-20 11:49 ` Bastien
  0 siblings, 1 reply; 5+ messages in thread
From: Sebastien Vauban @ 2012-02-16 15:01 UTC (permalink / raw)
  To: emacs-orgmode-mXXj517/zsQ

From 74f376c12cceae196f5a856eac1a39cdbcc8e360 Mon Sep 17 00:00:00 2001
From: Sebastien Vauban <sva-D0wtAvR13HarG/iDocfnWg@public.gmane.org>
Date: Thu, 16 Feb 2012 15:48:37 +0100
Subject: [PATCH] Add Time-stamp in export template

---
 lisp/org-exp.el |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index d9b5adc..2333bf0 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -3139,6 +3139,7 @@ Does include HTML export options as well as TODO and CATEGORY stuff."
 #+AUTHOR:    %s
 #+EMAIL:     %s
 #+DATE:      %s
+#+Time-stamp: <>
 #+DESCRIPTION:
 #+KEYWORDS:
 #+LANGUAGE:  %s
-- 
1.7.5.1


Best regards,
  Seb

-- 
Sebastien Vauban

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] Add "Time-stamp: <>" in (first 8 lines of) export template
  2012-02-16 15:01 [PATCH] Add "Time-stamp: <>" in (first 8 lines of) export template Sebastien Vauban
@ 2012-03-20 11:49 ` Bastien
  2012-03-20 12:45   ` Sebastien Vauban
  0 siblings, 1 reply; 5+ messages in thread
From: Bastien @ 2012-03-20 11:49 UTC (permalink / raw)
  To: Sebastien Vauban; +Cc: emacs-orgmode

Hi Sébastien,

"Sebastien Vauban" <wxhgmqzgwmuf@spammotel.com> writes:

>From 74f376c12cceae196f5a856eac1a39cdbcc8e360 Mon Sep 17 00:00:00 2001
> From: Sebastien Vauban <sva@mygooglest.com>
> Date: Thu, 16 Feb 2012 15:48:37 +0100
> Subject: [PATCH] Add Time-stamp in export template
>
> ---
>  lisp/org-exp.el |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)

I'm not applying this patch.

I see how it can be useful for those who use 

    (add-hook 'before-save-hook 'time-stamp)

but #+Time-stamp is *not* an Org option... so unless we find 
a way to use it without confusing the user, I won't apply it.

If you have another proposal, please provide a commit message
with your patch!

Thanks,

-- 
 Bastien

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] Add "Time-stamp: <>" in (first 8 lines of) export template
  2012-03-20 11:49 ` Bastien
@ 2012-03-20 12:45   ` Sebastien Vauban
  2012-03-20 15:58     ` Brian Wightman
  0 siblings, 1 reply; 5+ messages in thread
From: Sebastien Vauban @ 2012-03-20 12:45 UTC (permalink / raw)
  To: emacs-orgmode-mXXj517/zsQ

Hi Bastien,

Bastien wrote:
> "Sebastien Vauban" <wxhgmqzgwmuf-geNee64TY+gS+FvcfC7Uqw@public.gmane.org> writes:
>
>>From 74f376c12cceae196f5a856eac1a39cdbcc8e360 Mon Sep 17 00:00:00 2001
>> From: Sebastien Vauban <sva-D0wtAvR13HarG/iDocfnWg@public.gmane.org>
>> Date: Thu, 16 Feb 2012 15:48:37 +0100
>> Subject: [PATCH] Add Time-stamp in export template
>>
>> ---
>>  lisp/org-exp.el |    1 +
>>  1 files changed, 1 insertions(+), 0 deletions(-)
>
> I'm not applying this patch.
>
> I see how it can be useful for those who use
>
>     (add-hook 'before-save-hook 'time-stamp)
>
> but #+Time-stamp is *not* an Org option... so unless we find
> a way to use it without confusing the user, I won't apply it.

OK, so what about adding it as an Org option?

Even if, by default, it must be capitalized as in the example, I can make it
become case-insensitive, so that `#+time-stamp', `#+Time-stamp' and
`#+TIME-STAMP' all are accepted.

Then, I can provide a patch with `time-stamp' function added to
`before-save-hook' in Org mode.

> If you have another proposal, please provide a commit message
> with your patch!

I'll do.

Best regards,
  Seb

-- 
Sebastien Vauban

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] Add "Time-stamp: <>" in (first 8 lines of) export template
  2012-03-20 12:45   ` Sebastien Vauban
@ 2012-03-20 15:58     ` Brian Wightman
  2012-03-23 14:10       ` Bastien
  0 siblings, 1 reply; 5+ messages in thread
From: Brian Wightman @ 2012-03-20 15:58 UTC (permalink / raw)
  To: Sebastien Vauban; +Cc: emacs-orgmode

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] Add "Time-stamp: <>" in (first 8 lines of) export template
  2012-03-20 15:58     ` Brian Wightman
@ 2012-03-23 14:10       ` Bastien
  0 siblings, 0 replies; 5+ messages in thread
From: Bastien @ 2012-03-23 14:10 UTC (permalink / raw)
  To: Brian Wightman; +Cc: Sebastien Vauban, emacs-orgmode

Hi Brian,

Brian Wightman <MidLifeXis@wightmanfam.org> writes:

> 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.

I agree adding Time-stamp as a keyword could lead to such problems.  
So unless there are new arguments for such an inclusion, I'm closing
this right now.  

Sébastien, if you have your own hack for this, please share it on Worg!

Best,

-- 
 Bastien

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2012-03-23 14:09 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-16 15:01 [PATCH] Add "Time-stamp: <>" in (first 8 lines of) export template Sebastien Vauban
2012-03-20 11:49 ` Bastien
2012-03-20 12:45   ` Sebastien Vauban
2012-03-20 15:58     ` Brian Wightman
2012-03-23 14:10       ` Bastien

Code repositories for project(s) associated with this 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).