[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Missing changes in merges from emacs-25 to master
From: |
Eli Zaretskii |
Subject: |
Re: Missing changes in merges from emacs-25 to master |
Date: |
Fri, 25 Mar 2016 21:43:02 +0300 |
> From: David Engster <address@hidden>
> Cc: address@hidden, address@hidden
> Date: Fri, 25 Mar 2016 18:52:06 +0100
>
> > So I guess the fact that a commit was skipped during a merge is
> > something that is so hard to see that perhaps the entire issue of
> > skipping is moot with Git, and we shouldn't be bothered by it.
>
> Well, it's not *that* hard to see, but it usually requires to look at a
> span of commits. In this case,
>
> git diff cb4e054e41c..300560577
>
> will correctly produce nothing. But I agree it's unfortunate that you
> cannot see this from the merge commit alone. But I'm not sure what you
> mean with the entire issue being moot. How do you suggest we deal with
> commits that shouldn't land in master?
Sorry, I should have made it clear I was talking only about the
backported commits.
- Re: Missing changes in merges from emacs-25 to master, (continued)
- Re: Missing changes in merges from emacs-25 to master, David Engster, 2016/03/25
- Re: Missing changes in merges from emacs-25 to master, Eli Zaretskii, 2016/03/25
- Re: Missing changes in merges from emacs-25 to master, David Engster, 2016/03/25
- Re: Missing changes in merges from emacs-25 to master, Eli Zaretskii, 2016/03/25
- Re: Missing changes in merges from emacs-25 to master, David Engster, 2016/03/25
- Re: Missing changes in merges from emacs-25 to master, David Engster, 2016/03/25
- Re: Missing changes in merges from emacs-25 to master, Eli Zaretskii, 2016/03/25
- Re: Missing changes in merges from emacs-25 to master, David Engster, 2016/03/25
- Re: Missing changes in merges from emacs-25 to master,
Eli Zaretskii <=
- Re: Missing changes in merges from emacs-25 to master, Óscar Fuentes, 2016/03/25
- Re: Missing changes in merges from emacs-25 to master, Paul Eggert, 2016/03/25
- Re: Missing changes in merges from emacs-25 to master, Stefan Monnier, 2016/03/26
- Re: Missing changes in merges from emacs-25 to master, Phillip Lord, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, Eli Zaretskii, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, John Wiegley, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, Eli Zaretskii, 2016/03/22