[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Missing changes in merges from emacs-25 to master
From: |
Paul Eggert |
Subject: |
Re: Missing changes in merges from emacs-25 to master |
Date: |
Mon, 21 Mar 2016 17:52:56 -0700 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 |
On 03/21/2016 05:17 PM, Paul Eggert wrote:
(I did not look for similar clumps yet.)
I looked for similar clumps of errors (i.e., patches lost by incorrect
merges to master), and found two as noted below. I suspect gitmerge.el
somehow encourages these errors, but haven't looked into how that might
be. In the meantime I suggest looking skeptically at anything gitmerge
does where the log message looks like "The following commit was skipped:
... Merge branch 'A' ... into B", as skipping a merge ought to be a big
deal.
I installed the attached patches to attempt to resurrect the two lost
master patches.
Here are logs for the merges that lost patches:
commit 5ab243f40e4db91586ff74b01a775a5218a1d5be
Merge: f991a50 52f64cc
Author: John Wiegley <address@hidden>
Date: Thu Mar 3 23:53:26 2016 -0800
; Merge from origin/emacs-25
The following commit was skipped:
52f64cc Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs
into emacs-25
This lost commit 433407d8230a8a256b26c6c7615d3921b43f59ce.
commit c71e7cc113ed0d5f01aaa2e441a3e3c9fbeb9fa5
Merge: f55fc92 1fbcc8a
Author: Paul Eggert <address@hidden>
Date: Tue Feb 9 14:23:10 2016 -0800
; Merge from origin/emacs-25
The following commit was skipped:
1fbcc8a Merge branch 'emacs-25' of
git.savannah.gnu.org:/srv/git/emacs into emacs-25
This lost commit c1d32a65372c72d7de4808d620eefd3214a8e92a.
0001-etc-TODO-Minor-quoting-and-grammar-fixes.patch
Description: Source code patch
0002-Fix-problems-caused-by-new-implementation-of-sub-wor.patch
Description: Source code patch
- Re: Missing changes in merges from emacs-25 to master, (continued)
- Re: Missing changes in merges from emacs-25 to master, Noam Postavsky, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, martin rudalics, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, Eli Zaretskii, 2016/03/21
- Re: Missing changes in merges from emacs-25 to master, John Wiegley, 2016/03/21
- Re: Missing changes in merges from emacs-25 to master, Paul Eggert, 2016/03/21
- Re: Missing changes in merges from emacs-25 to master, Eli Zaretskii, 2016/03/21
- Re: Missing changes in merges from emacs-25 to master, John Wiegley, 2016/03/21
- Re: Missing changes in merges from emacs-25 to master, Paul Eggert, 2016/03/21
- Re: Missing changes in merges from emacs-25 to master,
Paul Eggert <=
- Re: Missing changes in merges from emacs-25 to master, Eli Zaretskii, 2016/03/21
- 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, Stefan Monnier, 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, Stefan Monnier, 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, Paul Eggert, 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, Stefan Monnier, 2016/03/23
- Re: Missing changes in merges from emacs-25 to master, Stefan Monnier, 2016/03/22