all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: Richard Copley <rcopley@gmail.com>
Cc: 23830@debbugs.gnu.org
Subject: bug#23830: 25.0.94; Emacs eats left Windows key on Windows 7
Date: Thu, 23 Jun 2016 05:35:52 +0300	[thread overview]
Message-ID: <8337o44oon.fsf@gnu.org> (raw)
In-Reply-To: <CAPM58oi5csCvG22xjuRuZ8HCwWV8XS3+d5dkQVTeOR3MwK5erw@mail.gmail.com> (message from Richard Copley on Wed, 22 Jun 2016 20:33:34 +0100)

> From: Richard Copley <rcopley@gmail.com>
> Date: Wed, 22 Jun 2016 20:33:34 +0100
> Cc: 23830@debbugs.gnu.org
> 
> >> My two most recent emacs-25 builds are from revisions:
> >>   ab182c624868fcc0ed97597db669911099d4bd28 (commit time 2016-06-12
> >> 17:33:52 UTC),
> >>   788c9b69e1801dd883dbe603281571ef3c78a724 (commit time 2016-05-31
> >> 06:17:55 UTC).
> >> The bug is present in the 2016-06-12 build and absent in the 2016-05-31 build.
> 
> > These two commits are not on the emacs-25 branch.
> 
> Sorry for the confusion.
> I don't want to jump to conclusions but assuming you're right then I
> must have built from master and forgotten about it.
> 
> Is it possible you're only half right and that one of those two
> commits is on emacs-25 and the other is not?
> I ask because I get the following values inside the two builds:
> 
> (emacs-version) "GNU Emacs 25.0.94.1 (x86_64-w64-mingw32)
>  of 2016-05-31"
> emacs-repository-version "788c9b69e1801dd883dbe603281571ef3c78a724"

Yes, this commit indeed started on emacs-25.  Which explains why you
say it doesn't have the problem: the emacs-25 branch doesn't have that
problem at all, to this day.

It also means that the problem appeared on master much earlier,
probably when the changes were done in February.

> Can you please tell me how to verify whether a commit is on a branch
> for myself (so I'm less likely to make mistakes like this in the
> future)?
> What I did is this:
>   (in Git CMD in repository root): git checkout emacs-25 && git pull
>   (in Emacs in repository root): C-x v L ;; vc-print-root-log
> then searched for and found both commits' checksums.
> The root log starts (HEAD -> emacs-25, origin/master, origin/HEAD,
> master). Maybe it's actually a combined log. I'm more familiar with
> Subversion and perhaps I made unwarranted assumptions about Git's log.

We merge from emacs-25 to master, so commits from emacs-26 eventually
appear on master as well.





  parent reply	other threads:[~2016-06-23  2:35 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-22 18:22 bug#23830: 25.0.94; Emacs eats left Windows key on Windows 7 Richard Copley
2016-06-22 18:45 ` Eli Zaretskii
2016-06-22 19:33   ` Richard Copley
2016-06-22 21:22     ` Óscar Fuentes
2016-06-23  2:35     ` Eli Zaretskii [this message]
2016-06-23 11:03       ` Richard Copley
2016-06-23 14:34         ` Eli Zaretskii
2016-06-23 20:43           ` Richard Copley

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=8337o44oon.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=23830@debbugs.gnu.org \
    --cc=rcopley@gmail.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.