unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: Andreas Schwab <schwab@linux-m68k.org>
Cc: emacs-devel@gnu.org
Subject: Re: Confusing "bzr log" as result of merges
Date: Sat, 21 May 2011 11:44:46 +0300	[thread overview]
Message-ID: <83fwo8fnnl.fsf@gnu.org> (raw)
In-Reply-To: <m2d3jca1qu.fsf@linux-m68k.org>

> From: Andreas Schwab <schwab@linux-m68k.org>
> Cc: emacs-devel@gnu.org
> Date: Sat, 21 May 2011 10:36:57 +0200
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> 
> > And why was 99634.2.937 merged to the trunk, even though the log
> > message clearly says it's a backport?  If we avoid merging such
> > backported revisions, will this problem go away?
> 
> A merge always includes all parent revisions.  There is no way to "avoid
> merging a backported revision".

Maybe with git.  With bzr, "merge" accepts a switch that can specify
revisions to merge.

IOW, revision 100577 on the emacs-23 branch could have been omitted
from the merge, because its log message says it's a backport.



  reply	other threads:[~2011-05-21  8:44 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 [this message]
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
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=83fwo8fnnl.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    --cc=schwab@linux-m68k.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).