From: Glenn Morris <rgm@gnu.org>
To: Bastien <bzg@altern.org>
Cc: emacs-devel@gnu.org
Subject: Re: Merged Org 7.7
Date: Wed, 17 Aug 2011 14:04:01 -0400 [thread overview]
Message-ID: <5yfwkz9apa.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <87zkjatgab.fsf@gnu.org> (Bastien's message of "Tue, 16 Aug 2011 01:18:36 +0200")
Bastien wrote:
>> http://lists.gnu.org/archive/html/emacs-diffs/2011-08/msg00062.html
>> http://lists.gnu.org/archive/html/emacs-diffs/2011-01/msg00156.html
>
> These emails are not the one about _your_ change, or do I miss
> something?
Yes, the change to copyright years was made in the emacs-23 branch by
me, then merged to trunk by Stefan, so I believe the last one represents
the relevant change. But perhaps I made other smaller changes after that
to correct issues, I cannot remember. bzr log can show you all the
revisions that affected a particular file.
But I don't think that's the best way to do it. If you look at
the diff corresponding to your initial merge of 7.7, and the more recent
one for the etc and doc/misc directories, and just revert all the
changes to the Copyright lines, that ought to fix it. Eg as I said
-Copyright @copyright{} 2004-2011 Free Software Foundation, Inc.
+Copyright @copyright{} 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Free Software Foundation, Inc.
next prev parent reply other threads:[~2011-08-17 18:04 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-28 15:52 Merged Org 7.7 Bastien
2011-08-06 21:16 ` Glenn Morris
2011-08-06 21:27 ` Glenn Morris
2011-08-06 21:55 ` Glenn Morris
2011-08-15 14:41 ` Bastien
2011-08-15 14:57 ` Bastien
2011-08-15 21:05 ` Glenn Morris
2011-08-16 7:14 ` Bastien
2011-08-15 15:00 ` Bastien
2011-08-15 20:38 ` Glenn Morris
2011-08-16 7:14 ` Bastien
2011-08-15 17:15 ` Eduard Wiebe
2011-08-15 17:49 ` Bastien
2011-08-15 15:03 ` Bastien
2011-08-15 20:35 ` Glenn Morris
2011-08-15 20:48 ` Glenn Morris
2011-08-15 21:27 ` Glenn Morris
2011-08-16 7:28 ` Bastien
2011-08-15 23:18 ` Bastien
2011-08-17 18:04 ` Glenn Morris [this message]
2011-08-18 7:52 ` Bastien
2011-08-18 20:59 ` Glenn Morris
2011-08-19 12:55 ` Bastien
2011-08-15 15:05 ` Bastien
2011-08-15 18:07 ` Paul Eggert
2011-08-17 12:43 ` Bastien
2011-08-16 7:15 ` Bastien
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5yfwkz9apa.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--cc=bzg@altern.org \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.