From: Miles Bader <miles.bader@necel.com>
To: Glenn Morris <rgm@gnu.org>
Cc: Eli Zaretskii <eliz@gnu.org>, Nick Roberts <nickrob@snap.net.nz>,
emacs-devel@gnu.org
Subject: Re: Renaming NEWS
Date: Tue, 22 May 2007 16:12:01 +0900 [thread overview]
Message-ID: <buoodkdnxha.fsf@dhapc248.dev.necel.com> (raw)
In-Reply-To: <40646l9wzy.fsf@fencepost.gnu.org> (Glenn Morris's message of "Tue\, 22 May 2007 02\:46\:09 -0400")
Glenn Morris <rgm@gnu.org> writes:
> No, leaving the arch tag in lisp/ChangeLog would seem to make more
> sense to me. Anyone who is using this tag must expect it to refer to
> the "current lisp ChangeLog", not some random ChangeLog.NN.
> ChangeLog.12, which will almost never be used, should get a new arch
> tag.
People don't use the tag. The tag is used by tools to establish file
identity.
In general the tag should move with the file (and will be used by arch
to move the file in a branch when merging into the branch).
If you want "ChangeLog" changes on the branch to continue to go to the
"ChangeLog" on the trunk then indeed, you're right ... but this will
complicate things to some degree with merging to other branches, because
the "contents move" on the trunk will be essentially be a huge delete
from one file (ChangeLog) and a huge add to another file (ChangeLog.12)
-- and large textual changes like that are quite brittle (e.g., the
presence of slight text differences in the ChangeLog of another branch
will cause a merge conflict for the whole huge chunk).
I guess it doesn't matter too much one way or another though; since it's
a rare event and affects few files, it's not really a big deal to fix
things up by hand.
-Miles
--
"I distrust a research person who is always obviously busy on a task."
--Robert Frosch, VP, GM Research
next prev parent reply other threads:[~2007-05-22 7:12 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-12 10:02 [PATCH] Console based mouse face highlighting Nick Roberts
2007-05-12 10:11 ` Nick Roberts
2007-05-12 13:25 ` Eli Zaretskii
2007-05-12 23:54 ` Nick Roberts
2007-05-13 3:42 ` Eli Zaretskii
2007-05-13 4:19 ` Nick Roberts
2007-05-13 4:41 ` Eli Zaretskii
2007-05-14 21:11 ` Nick Roberts
2007-05-15 3:26 ` Eli Zaretskii
2007-05-15 3:53 ` Nick Roberts
2007-05-15 21:15 ` Eli Zaretskii
2007-05-15 21:33 ` David Kastrup
2007-05-16 3:16 ` Eli Zaretskii
2007-05-15 22:39 ` [PATCH/Now RFA] " Nick Roberts
2007-05-16 3:24 ` Eli Zaretskii
2007-05-16 3:54 ` Nick Roberts
2007-05-16 10:00 ` [RFA] " Nick Roberts
2007-05-16 18:19 ` Eli Zaretskii
2007-05-16 21:46 ` Nick Roberts
2007-05-17 3:24 ` Eli Zaretskii
2007-05-17 3:54 ` Nick Roberts
2007-05-17 14:59 ` Stefan Monnier
2007-05-17 20:29 ` Eli Zaretskii
2007-05-17 22:29 ` Nick Roberts
2007-05-17 20:14 ` Eli Zaretskii
2007-05-17 22:34 ` Nick Roberts
2007-05-18 14:33 ` Eli Zaretskii
2007-05-18 21:09 ` Nick Roberts
2007-05-19 7:25 ` Eli Zaretskii
2007-05-19 8:15 ` Nick Roberts
2007-05-19 8:46 ` Eli Zaretskii
2007-05-20 6:00 ` Nick Roberts
2007-05-20 9:37 ` Johan Bockgård
2007-05-20 9:51 ` Nick Roberts
2007-05-22 15:54 ` Johan Bockgård
2007-05-22 21:36 ` Nick Roberts
2007-05-30 5:41 ` Nick Roberts
2007-06-03 1:12 ` Nick Roberts
2007-06-03 21:27 ` Richard Stallman
2007-06-03 22:15 ` Drew Adams
2007-06-03 23:31 ` Nick Roberts
2007-06-04 3:24 ` Eli Zaretskii
2007-05-20 18:54 ` Eli Zaretskii
2007-05-20 20:12 ` Renaming NEWS [was: [RFA] Console based mouse face highlighting.] Glenn Morris
2007-05-20 20:42 ` Nick Roberts
2007-05-20 21:31 ` Renaming NEWS Miles Bader
2007-05-21 8:09 ` Glenn Morris
2007-05-21 8:42 ` David Kastrup
2007-05-22 6:46 ` Glenn Morris
2007-05-22 7:12 ` Miles Bader [this message]
2007-05-22 17:08 ` Glenn Morris
2007-05-22 8:30 ` Richard Stallman
2007-05-22 17:09 ` Glenn Morris
2007-05-21 10:33 ` Renaming NEWS [was: [RFA] Console based mouse face highlighting.] Richard Stallman
2007-05-19 22:31 ` [RFA] Console based mouse face highlighting Richard Stallman
2007-05-14 16:57 ` [PATCH] " Stefan Monnier
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=buoodkdnxha.fsf@dhapc248.dev.necel.com \
--to=miles.bader@necel.com \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=miles@gnu.org \
--cc=nickrob@snap.net.nz \
--cc=rgm@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.