From: Eli Zaretskii <eliz@gnu.org>
To: Glenn Morris <rgm@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: Confusing "bzr log" as result of merges
Date: Sat, 21 May 2011 22:02:29 +0300 [thread overview]
Message-ID: <83r57rev22.fsf@gnu.org> (raw)
In-Reply-To: <874o4o55hw.fsf@fencepost.gnu.org>
> From: Glenn Morris <rgm@gnu.org>
> Cc: emacs-devel@gnu.org
> Date: Sat, 21 May 2011 13:27:07 -0400
>
> Eli Zaretskii wrote:
>
> > 99634.2.937: Eli Zaretskii 2011-05-09 Backport revisions 103939.1.41..103939.1.44 (inclusive) from trunk (bug#8623)
> >
> > and revision 99634.2.937 indeed made a few changes to xdisp.c. But
> > that version was merged to the trunk much earlier, in revision 104021,
> > and "bzr annotate" still shows that the changes attributed to revision
> > 99634.2.937 were made in 103939.1.41, not in 104201 nor in 99634.2.937:
>
> Haven't we been over this before?
>
> http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00609.html
Yes. My memory is limited to the last 5 months. Besides, _you_ have
been over this back then, not me.
Anyway, the side effects of this never cease to surprise me.
next prev parent reply other threads:[~2011-05-21 19:02 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-21 7:33 Confusing "bzr log" as result of merges Eli Zaretskii
2011-05-21 8:36 ` Andreas Schwab
2011-05-21 8:44 ` Eli Zaretskii
2011-05-21 8:48 ` Eli Zaretskii
2011-05-21 9:01 ` Sven Joachim
2011-05-21 9:16 ` Eli Zaretskii
2011-05-21 9:27 ` Sven Joachim
2011-05-21 9:30 ` Eli Zaretskii
2011-05-21 10:27 ` Sven Joachim
2011-05-21 9:02 ` Andreas Schwab
2011-05-21 9:20 ` Eli Zaretskii
2011-05-21 9:38 ` Andreas Schwab
2011-05-21 10:33 ` Eli Zaretskii
2011-05-21 10:54 ` Andreas Schwab
2011-05-21 10:38 ` Eli Zaretskii
2011-05-21 10:56 ` Andreas Schwab
2011-05-21 11:27 ` Eli Zaretskii
2011-05-21 12:23 ` Andreas Schwab
2011-05-21 12:28 ` Eli Zaretskii
2011-05-21 10:57 ` Sven Joachim
2011-05-21 13:04 ` Eli Zaretskii
2011-05-21 13:37 ` Andreas Schwab
2011-05-21 14:46 ` Eli Zaretskii
2011-05-21 15:18 ` Andreas Schwab
2011-05-21 15:51 ` Eli Zaretskii
2011-05-21 16:39 ` Andreas Schwab
2011-05-21 16:21 ` Óscar Fuentes
2011-05-21 16:42 ` Andreas Schwab
2011-05-21 17:00 ` Óscar Fuentes
2011-05-21 17:06 ` Andreas Schwab
2011-05-21 17:19 ` Óscar Fuentes
2011-05-21 17:52 ` Andreas Schwab
2011-05-22 11:33 ` Juanma Barranquero
2011-05-21 16:48 ` Eli Zaretskii
2011-05-21 17:09 ` Óscar Fuentes
2011-05-21 18:56 ` Eli Zaretskii
2011-05-21 17:27 ` Glenn Morris
2011-05-21 19:02 ` Eli Zaretskii [this message]
2011-05-22 1:46 ` Glenn Morris
2011-05-22 14:14 ` Stefan Monnier
2011-05-22 17:28 ` Eli Zaretskii
2011-05-22 19:15 ` Stefan Monnier
2011-05-23 3:01 ` Eli Zaretskii
2011-05-23 12:02 ` Stefan Monnier
2011-05-23 12:58 ` Eli Zaretskii
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=83r57rev22.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--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 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).