all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: martin rudalics <rudalics@gmx.at>
To: Paul Eggert <eggert@cs.ucla.edu>
Cc: John Wiegley <johnw@newartisans.com>,
	Eli Zaretskii <eliz@gnu.org>,
	emacs-devel@gnu.org
Subject: Re: Missing changes in merges from emacs-25 to master
Date: Mon, 21 Mar 2016 10:22:48 +0100	[thread overview]
Message-ID: <56EFBD68.1050307@gmx.at> (raw)
In-Reply-To: <56EFA47D.8020303@cs.ucla.edu>

[...]
 > which in turn is a parent of:
 >
 > commit 1b76d9168336ede8976b980aeaed64ae2908501a
 > Merge: bca4930 2e5a89f
 > Author: John Wiegley <johnw@newartisans.com>
 > Date:   Mon Jan 18 22:59:51 2016 -0800
 >
 >      -
 >
 > which in turn is a parent of:
 >
 > commit b895c72059521fec064ff27b4cfcfa4104081c4e
 > Merge: badcd38 1b76d91
 > Author: Vincent Belaïche <vincentb1@users.sourceforge.net>
 > Date:   Wed Jan 20 08:30:51 2016 +0100
 >
 >      Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
 >
 > which leads via a long thin graph to the merge commit
 > 82b089783e71b2aeef950eaecfe4cbc0735e64a2 that you identified as losing
 > the change.

Thanks for the forensics.  I have no idea which tools to use to trace
such a path.  One thing that stupefies me is that in

commit fbce4757a874cc43806eb41b8637538b101c3c69
Author: Alan Mackenzie <acm@muc.de>
Date:   Sun Jan 24 20:30:39 2016 +0000

which IIUC follows the commits you cited above, the "correct" version is
still there why it should have been already lost at least on January 20.

martin




  reply	other threads:[~2016-03-21  9:22 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 [this message]
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
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=56EFBD68.1050307@gmx.at \
    --to=rudalics@gmx.at \
    --cc=eggert@cs.ucla.edu \
    --cc=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    --cc=johnw@newartisans.com \
    /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.