[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Missing changes in merges from emacs-25 to master
From: |
Phillip Lord |
Subject: |
Re: Missing changes in merges from emacs-25 to master |
Date: |
Tue, 22 Mar 2016 17:00:49 +0000 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) |
Eli Zaretskii <address@hidden> writes:
>> But in these cases, the commit we lost should have been mentioned in
>> the list of skipped one. It wasn't, AFAICS.
>
> I think I know what happened. It goes like this:
>
> . Phillip worked on test selector for the test suite. When he
> finished, he made a local commit 549a765 on the emacs-25 branch.
>
> . Phillip then said "git pull", followed by "git push". This
> produced the merge-commit bb0cd31, which incorporated 9 other
> commits that were pushed there since the time Phillip started
> working on 549a765. One of these 9 commits was my commit that
> fixed resize_frame_windows.
Oh dear, should have made those changes on a branch and rebased from
emacs-25.
Phil
- 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, 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, Ó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 <=
- 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