From: Ralf Angeli <angeli@caeruleus.net>
To: Chong Yidong <cyd@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: RefTeX Merge
Date: Sun, 30 Sep 2012 22:46:04 +0200 [thread overview]
Message-ID: <87bognqlwz.fsf@caeruleus.net> (raw)
In-Reply-To: <87ehlphypr.fsf@gnu.org> (Chong Yidong's message of "Wed, 26 Sep 2012 18:20:48 +0800")
* Chong Yidong (2012-09-26) writes:
> Ralf Angeli <angeli@caeruleus.net> writes:
>
>> If the log can take such amount of data, then I would be fine with it.
>> And besides that I'd prepare a shorter entry for the ChangeLog file.
>
> From my estimation, once you take out entries for Makefile changes,
> releases, and synchs to Emacs, the ChangeLog is about 400 lines, which
> is manageable. So I think we can put it in the commit log.
It got about 100 lines more. I hope this is not a problem. At least
bzr didn't barf.
> In the version to be added to the ChangeLog file, you can collate the
> changes to each file, which should shorten the entry significantly.
> Still, I think a ChangeLog entry of ~100 lines is acceptable.
In the ChangeLog about 140 lines ended up. Again, I hope this is okay.
If necessary I can try to shave of a few.
> Let's not play with bzr join. We've had bad experiences with that on
> the elpa branch.
>
> I suggest just patching the affected files manually, then committing as
> though you had made the changes in one shot. Just be sure not to
> inadvertently change the headers (e.g. "This file is part of GNU Emacs")
> and so forth.
I've made some experiments with `bzr join' and I haven't really had
success. That's why I committed the changes as suggested above.
Thanks a lot to the people commenting on the topic for all the hints and
feedback.
--
Ralf
next prev parent reply other threads:[~2012-09-30 20:46 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-23 18:10 RefTeX Merge Ralf Angeli
2012-09-23 18:39 ` Paul Eggert
2012-09-24 6:13 ` Chong Yidong
2012-09-24 20:44 ` Ralf Angeli
2012-09-24 23:32 ` Richard Stallman
2012-09-25 6:30 ` Tassilo Horn
2012-09-26 6:11 ` Ralf Angeli
2012-09-26 7:09 ` Tassilo Horn
2012-09-26 7:59 ` Stephen J. Turnbull
2012-09-26 13:20 ` Stefan Monnier
2012-09-26 10:20 ` Chong Yidong
2012-09-26 13:24 ` Subdirectories in `lisp' Stefan Monnier
2012-09-30 20:46 ` Ralf Angeli [this message]
2012-09-23 18:48 ` RefTeX Merge Glenn Morris
2012-09-23 18:58 ` Glenn Morris
2012-09-23 19:09 ` Glenn Morris
2012-09-24 1:42 ` Glenn Morris
2012-09-24 1:50 ` Glenn Morris
2012-09-24 21:02 ` Ralf Angeli
2012-10-16 7:39 ` Tassilo Horn
2012-11-01 14:05 ` Ralf Angeli
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=87bognqlwz.fsf@caeruleus.net \
--to=angeli@caeruleus.net \
--cc=cyd@gnu.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.