* org-archive-location
@ 2008-11-19 16:45 Matthew Lundin
2008-11-19 17:09 ` org-archive-location Nick Dokos
2008-11-19 17:09 ` org-archive-location Bernt Hansen
0 siblings, 2 replies; 8+ messages in thread
From: Matthew Lundin @ 2008-11-19 16:45 UTC (permalink / raw)
To: emacs-orgmode
Hi Carsten,
I'm getting the following message with org 6.12b when I try to set a
custom org-archive-location:
org-advertized-archive-subtree: Invalid `org-archive-location'
I've tried this both with emacs 22.1.1 and 23.0.60.1.
Here's the relevant configuration line:
(setq org-archive-location "2008.org_archive")
Thanks for your help.
Matt
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: org-archive-location
2008-11-19 16:45 org-archive-location Matthew Lundin
@ 2008-11-19 17:09 ` Nick Dokos
2008-11-19 17:22 ` [PATCH] Clean up the description of org-archive-location Bernt Hansen
2008-11-19 17:09 ` org-archive-location Bernt Hansen
1 sibling, 1 reply; 8+ messages in thread
From: Nick Dokos @ 2008-11-19 17:09 UTC (permalink / raw)
To: Matthew Lundin; +Cc: emacs-orgmode
Matthew Lundin <mdl@imapmail.org> wrote:
> I'm getting the following message with org 6.12b when I try to set a
> custom org-archive-location:
>
> org-advertized-archive-subtree: Invalid `org-archive-location'
>
> I've tried this both with emacs 22.1.1 and 23.0.60.1.
>
> Here's the relevant configuration line:
>
> (setq org-archive-location "2008.org_archive")
>
This should probably be
(setq org-archive-location "2008.org_archive::")
but it does seem that there is something missing from (or something
extra in) the description of the variable:
org-archive-location is a variable defined in `org.elc'.
Its value is "%s_archive::"
Documentation:
The location where subtrees should be archived.
Otherwise, the value of this variable is a string, consisting of two
parts, separated by a double-colon.
...
Maybe this should read:
Documentation:
The location where subtrees should be archived.
The value of this variable is a string, consisting of two
parts, separated by a double-colon.
Nick
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: org-archive-location
2008-11-19 16:45 org-archive-location Matthew Lundin
2008-11-19 17:09 ` org-archive-location Nick Dokos
@ 2008-11-19 17:09 ` Bernt Hansen
2008-11-19 17:30 ` org-archive-location Matthew Lundin
1 sibling, 1 reply; 8+ messages in thread
From: Bernt Hansen @ 2008-11-19 17:09 UTC (permalink / raw)
To: Matthew Lundin; +Cc: emacs-orgmode
Matthew Lundin <mdl@imapmail.org> writes:
> Here's the relevant configuration line:
>
> (setq org-archive-location "2008.org_archive")
I think this should be
(setq org-archive-location "2008.org_archive::")
-Bernt
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] Clean up the description of org-archive-location
2008-11-19 17:09 ` org-archive-location Nick Dokos
@ 2008-11-19 17:22 ` Bernt Hansen
2008-11-20 7:26 ` Carsten Dominik
0 siblings, 1 reply; 8+ messages in thread
From: Bernt Hansen @ 2008-11-19 17:22 UTC (permalink / raw)
To: nicholas.dokos; +Cc: emacs-orgmode
This removes the ambiguous description that might lead org users
to try to set this variable without a '::' separator. Without
the separated C-c C-x C-S fails with
Invalid 'org-archive-location'
---
Here's my attempt at cleaning up the documentation of this variable.
This patch is available at git://git.norang.ca/org-mode in the branch
'fix-org-archive-location-docs'
-Bernt
lisp/org.el | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/lisp/org.el b/lisp/org.el
index b660f96..a27b4f1 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -2635,17 +2635,19 @@ If yes, offer to stop it and to save the buffer with the changes."
(defcustom org-archive-location "%s_archive::"
"The location where subtrees should be archived.
-Otherwise, the value of this variable is a string, consisting of two
-parts, separated by a double-colon.
-
-The first part is a file name - when omitted, archiving happens in the same
-file. %s will be replaced by the current file name (without directory part).
-Archiving to a different file is useful to keep archived entries from
-contributing to the Org-mode Agenda.
-
-The part after the double colon is a headline. The archived entries will be
-filed under that headline. When omitted, the subtrees are simply filed away
-at the end of the file, as top-level entries.
+The value of this variable is a string, consisting of two parts,
+separated by a double-colon. The first part is a filename and
+the second part is a headline.
+
+When the filename is omitted, archiving happens in the same file.
+%s in the filename will be replaced by the current file
+name (without the directory part). Archiving to a different file
+is useful to keep archived entries from contributing to the
+Org-mode Agenda.
+
+The archived entries will be filed as subtrees of the specified
+headline. When the headline is omitted, the subtrees are simply
+filed away at the end of the file, as top-level entries.
Here are a few examples:
\"%s_archive::\"
--
1.6.0.4.608.ga9645
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: org-archive-location
2008-11-19 17:09 ` org-archive-location Bernt Hansen
@ 2008-11-19 17:30 ` Matthew Lundin
0 siblings, 0 replies; 8+ messages in thread
From: Matthew Lundin @ 2008-11-19 17:30 UTC (permalink / raw)
To: Bernt Hansen; +Cc: emacs-orgmode
Thanks Nick and Bernt.
Bernt Hansen <bernt@norang.ca> writes:
> Matthew Lundin <mdl@imapmail.org> writes:
>
>> Here's the relevant configuration line:
>>
>> (setq org-archive-location "2008.org_archive")
>
> I think this should be
>
> (setq org-archive-location "2008.org_archive::")
>
> -Bernt
Works like a charm. Thanks!
Now on to the fancier stuff, as in:
(setq org-archive-location (concat "~/archive/" (format-time-string "%Y-%m") ".org::"))
I thought I had read the documentation carefully, but obviously I
hadn't read it carefully enough. My apologies.
I believe the "otherwise" in the documentation that Nick mentioned
threw me off. I assumed (erroneously) that one could use *either* a
simple path *or* a string consisting of path - double colon -
headline.
- Matt
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] Clean up the description of org-archive-location
2008-11-19 17:22 ` [PATCH] Clean up the description of org-archive-location Bernt Hansen
@ 2008-11-20 7:26 ` Carsten Dominik
2008-12-02 12:48 ` Christian Egli
0 siblings, 1 reply; 8+ messages in thread
From: Carsten Dominik @ 2008-11-20 7:26 UTC (permalink / raw)
To: Bernt Hansen; +Cc: emacs-orgmode
Another delicious cherry for me to pick, thanks Bernt and Nick.
Bernt,
I think I am ripe for a little lecture about remote repositories
and tracking them, so that I do not need to type the location of
your repo each time... :-)
- Carsten
On Nov 19, 2008, at 6:22 PM, Bernt Hansen wrote:
>
> This removes the ambiguous description that might lead org users
> to try to set this variable without a '::' separator. Without
> the separated C-c C-x C-S fails with
>
> Invalid 'org-archive-location'
> ---
> Here's my attempt at cleaning up the documentation of this variable.
>
> This patch is available at git://git.norang.ca/org-mode in the branch
> 'fix-org-archive-location-docs'
>
> -Bernt
>
> lisp/org.el | 24 +++++++++++++-----------
> 1 files changed, 13 insertions(+), 11 deletions(-)
>
> diff --git a/lisp/org.el b/lisp/org.el
> index b660f96..a27b4f1 100644
> --- a/lisp/org.el
> +++ b/lisp/org.el
> @@ -2635,17 +2635,19 @@ If yes, offer to stop it and to save the
> buffer with the changes."
> (defcustom org-archive-location "%s_archive::"
> "The location where subtrees should be archived.
>
> -Otherwise, the value of this variable is a string, consisting of two
> -parts, separated by a double-colon.
> -
> -The first part is a file name - when omitted, archiving happens in
> the same
> -file. %s will be replaced by the current file name (without
> directory part).
> -Archiving to a different file is useful to keep archived entries from
> -contributing to the Org-mode Agenda.
> -
> -The part after the double colon is a headline. The archived
> entries will be
> -filed under that headline. When omitted, the subtrees are simply
> filed away
> -at the end of the file, as top-level entries.
> +The value of this variable is a string, consisting of two parts,
> +separated by a double-colon. The first part is a filename and
> +the second part is a headline.
> +
> +When the filename is omitted, archiving happens in the same file.
> +%s in the filename will be replaced by the current file
> +name (without the directory part). Archiving to a different file
> +is useful to keep archived entries from contributing to the
> +Org-mode Agenda.
> +
> +The archived entries will be filed as subtrees of the specified
> +headline. When the headline is omitted, the subtrees are simply
> +filed away at the end of the file, as top-level entries.
>
> Here are a few examples:
> \"%s_archive::\"
> --
> 1.6.0.4.608.ga9645
>
>
>
> _______________________________________________
> Emacs-orgmode mailing list
> Remember: use `Reply All' to send replies to the list.
> Emacs-orgmode@gnu.org
> http://lists.gnu.org/mailman/listinfo/emacs-orgmode
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] Clean up the description of org-archive-location
2008-11-20 7:26 ` Carsten Dominik
@ 2008-12-02 12:48 ` Christian Egli
2008-12-02 13:24 ` Bernt Hansen
0 siblings, 1 reply; 8+ messages in thread
From: Christian Egli @ 2008-12-02 12:48 UTC (permalink / raw)
To: emacs-orgmode
Hi
Carsten Dominik <dominik@science.uva.nl> writes:
> I think I am ripe for a little lecture about remote repositories
> and tracking them, so that I do not need to type the location of
> your repo each time... :-)
Can't you just do
git remote add bernt git://git.norang.ca/org-mode
and then
git fetch bernt
At least that's my take if I read the section `Fetching' of
http://www.gnome.org/~federico/news-2008-11.html#pushing-and-pulling-with-git-1.
Unfortunatelly there is no explanation on how to merge the Bernt's
changes:
"In the next part, we'll see how to merge Larry's changes into
ours, and how to monitor his work to pull from it regularly."
HTH
Christian
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] Clean up the description of org-archive-location
2008-12-02 12:48 ` Christian Egli
@ 2008-12-02 13:24 ` Bernt Hansen
0 siblings, 0 replies; 8+ messages in thread
From: Bernt Hansen @ 2008-12-02 13:24 UTC (permalink / raw)
To: Christian Egli; +Cc: emacs-orgmode
Christian Egli <christian.egli@sbszh.ch> writes:
> Hi
>
> Carsten Dominik <dominik@science.uva.nl> writes:
>
>> I think I am ripe for a little lecture about remote repositories
>> and tracking them, so that I do not need to type the location of
>> your repo each time... :-)
>
> Can't you just do
>
> git remote add bernt git://git.norang.ca/org-mode
>
> and then
>
> git fetch bernt
>
> At least that's my take if I read the section `Fetching' of
> http://www.gnome.org/~federico/news-2008-11.html#pushing-and-pulling-with-git-1.
>
Yes. (sorry I sent a reply to this off-list originally)
NOTE: The branches in my repository are temporary and rewritten for
future work after they have been included or rejected by Carsten
so you may not always find a 'for-carsten' branch in that repo.
This also means you can't track the 'for-carsten' branch locally
in your repository since it gets rewritten with rebase.
git remote add bernt git://git.norang.ca/org-mode will add a remote
named 'bernt' which you can fetch from.
When you fetch a branch using
git fetch bernt for-carsten
it creates the missing objects in your repository and points a temporary
reference FETCH_HEAD at that branch.
> Unfortunatelly there is no explanation on how to merge the Bernt's
> changes:
>
> "In the next part, we'll see how to merge Larry's changes into
> ours, and how to monitor his work to pull from it regularly."
You can view it compared to your master branch with
gitk master FETCH_HEAD
and you're free to cherry-pick commits from it. If you want to change
things you can create a branch there with
git checkout -b temp FETCH_HEAD
then you can rebase that based on other things etc.
Applying changes from my repo matches the git format-patch and git am
workflow (which is normally how one deals with patches from the mailing
list) if you do this: (this assumes no conflicts and creates linear
history)
git fetch bernt for-carsten
git checkout -b temp FETCH_HEAD
git rebase master
git checkout master
git merge temp
git branch -D temp
HTH,
Bernt
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2008-12-02 13:25 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-11-19 16:45 org-archive-location Matthew Lundin
2008-11-19 17:09 ` org-archive-location Nick Dokos
2008-11-19 17:22 ` [PATCH] Clean up the description of org-archive-location Bernt Hansen
2008-11-20 7:26 ` Carsten Dominik
2008-12-02 12:48 ` Christian Egli
2008-12-02 13:24 ` Bernt Hansen
2008-11-19 17:09 ` org-archive-location Bernt Hansen
2008-11-19 17:30 ` org-archive-location Matthew Lundin
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).