From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Eli Zaretskii <eliz@gnu.org>
Cc: eggert@cs.ucla.edu, emacs-devel@gnu.org
Subject: Re: merge-commits policy
Date: Tue, 17 May 2011 16:50:57 -0300 [thread overview]
Message-ID: <jwvd3jh6rc2.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <83boz1gqfs.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 17 May 2011 20:57:59 +0300")
>> As would searching the ChangeLog rather than "bzr log".
> Unfortunately, only some of these updates are reflected in
> doc/misc/ChangeLog, and some aren't, so this is unreliable.
That's a problem that needs fixing, then.
>> Personally I would use C-x v l and/or C-x v g from the texinfo.tex buffer.
> "C-x v l" takes ages for veteran files (because texinfo.tex was
> "cvs mv"ed, it appears to have been born relatively recently, so it is
> spared this problem). To be efficient, you need to run "bzr log" for
> a certain range of revisions.
> "C-x v g" is fine only the first time. Once you find the latest
> revision that modified some line, and need to see the previous
> revisions that modified the same line, you need to find the exact
> revision number and use "-r before:", or else you will miss some of
> the change history, e.g. if there were more than one change on the
> branch before it was merged.
> Like I said: possible, but harder.
Yup. These are problems with Bazaar (and/or with vc-bzr.el).
>> > different features and unrelated bugfixes. If you regard any "sync
>> > from gnulib" as a single self-contained changeset, then at least it
>> > should be committed to mainline separately from other changes.
>> That would make sense, yes. Although in the case of gnulib, most
>> "syncs" happen because we import yet another module, so it's OK to do
>> both "import foo module" and "sync" at the same time, but indeed, the
>> commit message should indicate that a sync with gnulib took place.
> Thanks, I hope this is acceptable.
It is.
Stefan
prev parent reply other threads:[~2011-05-17 19:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <4DD0B118.1040205@cs.ucla.edu>
[not found] ` <83pqnjdxga.fsf@gnu.org>
[not found] ` <4DD0B70F.7090801@cs.ucla.edu>
[not found] ` <83mxindqmp.fsf@gnu.org>
[not found] ` <jwvsjsey4ms.fsf-monnier+emacs@gnu.org>
2011-05-17 10:30 ` merge-commits policy (was: bug#8675: lisp_string_width and strings wider than INT_MAX) Eli Zaretskii
2011-05-17 13:42 ` merge-commits policy Stefan Monnier
2011-05-17 17:57 ` Eli Zaretskii
2011-05-17 19:50 ` Stefan Monnier [this message]
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvd3jh6rc2.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=eggert@cs.ucla.edu \
--cc=eliz@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 public inbox
https://git.savannah.gnu.org/cgit/emacs.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).