From: David Engster <deng@randomsample.de>
To: Eli Zaretskii <eliz@gnu.org>
Cc: John Wiegley <johnw@gnu.org>, emacs-devel@gnu.org
Subject: Re: Missing changes in merges from emacs-25 to master
Date: Fri, 25 Mar 2016 10:15:41 +0100 [thread overview]
Message-ID: <87vb4azznm.fsf@engster.org> (raw)
In-Reply-To: <83oaa30wjs.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 25 Mar 2016 11:52:07 +0300")
Eli Zaretskii writes:
> There seems to be another issue with merging to master: we get back
> commits that were cherry-picked from master to the release branch.
When you merge a branch, you have to merge all of it. But when they are
marked as 'skipped', they will be merged with strategy "ours",
effectively ignoring their content. This is how it worked with Bazaar as
well.
-David
next prev parent reply other threads:[~2016-03-25 9:15 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-20 11:36 Missing changes in merges from emacs-25 to master martin rudalics
2016-03-20 17:32 ` Eli Zaretskii
2016-03-20 18:38 ` martin rudalics
2016-03-20 18:50 ` Eli Zaretskii
2016-03-20 19:15 ` martin rudalics
2016-03-21 7:36 ` Paul Eggert
2016-03-21 9:22 ` martin rudalics
2016-03-21 17:55 ` Paul Eggert
2016-03-22 10:22 ` martin rudalics
2016-03-22 10:36 ` Andreas Schwab
2016-03-22 10:58 ` martin rudalics
2016-03-22 11:32 ` Andreas Schwab
2016-03-22 11:47 ` martin rudalics
2016-03-22 15:20 ` Óscar Fuentes
2016-03-22 17:08 ` martin rudalics
2016-03-22 15:24 ` Noam Postavsky
2016-03-22 17:08 ` martin rudalics
2016-03-21 16:06 ` Eli Zaretskii
2016-03-21 17:55 ` John Wiegley
2016-03-21 17:57 ` Paul Eggert
2016-03-21 18:16 ` Eli Zaretskii
2016-03-21 21:27 ` John Wiegley
2016-03-22 0:17 ` Paul Eggert
2016-03-22 0:52 ` Paul Eggert
2016-03-22 3:35 ` Eli Zaretskii
2016-03-22 16:18 ` Eli Zaretskii
2016-03-22 16:30 ` Stefan Monnier
2016-03-22 16:45 ` Eli Zaretskii
2016-03-22 16:52 ` Stefan Monnier
2016-03-22 17:03 ` Eli Zaretskii
2016-03-22 18:21 ` Paul Eggert
2016-03-22 18:33 ` Eli Zaretskii
2016-03-23 13:10 ` Stefan Monnier
2016-03-22 18:41 ` Stefan Monnier
2016-03-22 18:58 ` Eli Zaretskii
2016-03-23 2:08 ` Stefan Monnier
2016-03-23 8:07 ` Andreas Schwab
2016-03-22 19:34 ` Lars Magne Ingebrigtsen
2016-03-22 19:49 ` Eli Zaretskii
2016-03-24 7:18 ` Phillip Lord
2016-03-22 18:32 ` Paul Eggert
2016-03-22 18:37 ` Eli Zaretskii
2016-03-22 19:15 ` Paul Eggert
2016-03-22 19:42 ` Eli Zaretskii
2016-03-22 20:26 ` Paul Eggert
2016-03-22 22:57 ` David Engster
2016-03-22 23:45 ` Paul Eggert
2016-03-25 8:52 ` Eli Zaretskii
2016-03-25 9:14 ` Andreas Schwab
2016-03-25 10:48 ` Eli Zaretskii
2016-03-25 11:50 ` Andreas Schwab
2016-03-25 13:55 ` Eli Zaretskii
2016-03-25 9:15 ` David Engster [this message]
2016-03-25 10:50 ` Eli Zaretskii
2016-03-25 11:38 ` David Engster
2016-03-25 14:15 ` Eli Zaretskii
2016-03-25 16:00 ` David Engster
2016-03-25 16:27 ` David Engster
2016-03-25 17:33 ` Eli Zaretskii
2016-03-25 17:52 ` David Engster
2016-03-25 18:43 ` Eli Zaretskii
2016-03-25 19:29 ` Óscar Fuentes
2016-03-25 19:42 ` Paul Eggert
2016-03-26 21:34 ` Stefan Monnier
2016-03-22 17:00 ` Phillip Lord
2016-03-22 18:24 ` Eli Zaretskii
2016-03-22 19:21 ` John Wiegley
2016-03-22 19:46 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87vb4azznm.fsf@engster.org \
--to=deng@randomsample.de \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=johnw@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.