From: Eli Zaretskii <eliz@gnu.org>
To: esr@thyrsus.com
Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org
Subject: Re: git transition issues
Date: Fri, 31 Oct 2014 13:03:09 +0200 [thread overview]
Message-ID: <83egtozeky.fsf@gnu.org> (raw)
In-Reply-To: <20141031105142.GA27981@thyrsus.com>
> Date: Fri, 31 Oct 2014 06:51:42 -0400
> From: "Eric S. Raymond" <esr@thyrsus.com>
> Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org
>
> > > Hm. Which target branch are we talking?
> >
> > emacs-24, of course.
> >
> > > Because I ported those changes to the emacs-24 branch yesterday.
> >
> > I don't see any of that in "bzr log"s output in that branch. Can you
> > tell which revision numbers or revision-IDs you committed to emacs-24
> > yesterday?
>
> Checking...117637 in my log.
>
> ------------------------------------------------------------
> revno: 117637
> committer: Eric S. Raymond <esr@thyrsus.com>
> branch nick: emacs-24
> timestamp: Thu 2014-10-30 15:21:32 -0400
> message:
> Port preparatory patches for the git transition from trunk.
>
> These contain no git-specific language or code; rather, they change
> language that was bzr-specific to be independent of the VCS type.
I guess you didn't push it, then, because revno 117637 in the upstream
repo is this:
$ bzr log --long -v -c117637 --show-ids
------------------------------------------------------------
revno: 117637
revision-id: jan.h.d@swipnet.se-20141030191538-3sptx5py8gjdfrw1
parent: jan.h.d@swipnet.se-20141030172352-wxk72s27bw3rsmic
fixes bug: http://debbugs.gnu.org/18884
committer: Jan D. <jan.h.d@swipnet.se>
branch nick: emacs-24
timestamp: Thu 2014-10-30 19:15:38 +0000
message:
* nsfns.m (ns_set_doc_edited): Do all logic (check frames) here
instead of in xdisp.c, function now takes void.
* nsterm.h (ns_set_doc_edited): Declare taking no args.
* xdisp.c (prepare_menu_bars): Remove HAVE_NS code.
(redisplay_internal): Call ns_set_doc_edited if HAVE_NS (Bug#18884).
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/nsfns.m nsfns.m-20091113204419-o5vbwnq5f7feedwu-8741
src/nsterm.h nsterm.h-20091113204419-o5vbwnq5f7feedwu-8746
src/xdisp.c xdisp.c-20091113204419-o5vbwnq5f7feedwu-240
What does the following command say, when you run it from your
emacs-24 branch?
$ bzr missing bzr+ssh://esr@bzr.savannah.gnu.org/emacs/emacs-24/
(Assuming your savannah username is esr; if not, change accordingly).
Does this show revno 117637 as missing upstream?
next prev parent reply other threads:[~2014-10-31 11:03 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-27 0:07 git transition issues Eric S. Raymond
2014-10-27 1:08 ` Stefan Monnier
2014-10-27 1:28 ` Eric S. Raymond
2014-10-27 13:10 ` Stefan Monnier
2014-10-28 15:35 ` Glenn Morris
2014-10-28 16:36 ` Eric S. Raymond
2014-10-28 18:01 ` Eli Zaretskii
2014-10-28 18:07 ` Eric S. Raymond
2014-10-28 18:19 ` Eli Zaretskii
2014-10-29 0:58 ` Stefan Monnier
2014-10-31 9:17 ` Eli Zaretskii
2014-10-31 10:23 ` Eric S. Raymond
2014-10-31 10:27 ` Eli Zaretskii
2014-10-31 10:51 ` Eric S. Raymond
2014-10-31 11:03 ` Eli Zaretskii [this message]
2014-10-31 13:00 ` Eric S. Raymond
2014-11-01 0:39 ` Stephen J. Turnbull
2014-11-15 14:52 ` Rewriting bzrmerge.el (was: git transition issues) David Engster
2014-11-15 15:40 ` Rewriting bzrmerge.el Paul Eggert
2014-11-15 16:01 ` Stefan Monnier
2014-11-15 16:32 ` Eli Zaretskii
2014-11-15 16:04 ` Stefan Monnier
2014-11-15 16:10 ` David Engster
2014-11-15 16:26 ` David Engster
2014-11-16 3:50 ` Stefan Monnier
2014-11-21 22:47 ` David Engster
2014-11-22 8:16 ` Eli Zaretskii
2014-11-22 16:13 ` David Engster
2014-11-22 16:42 ` Eli Zaretskii
2014-11-22 17:17 ` David Engster
2014-11-22 20:30 ` Eli Zaretskii
2014-11-22 21:11 ` David Engster
2014-11-23 3:35 ` Eli Zaretskii
2014-11-23 16:32 ` Steinar Bang
2014-11-23 17:49 ` David Engster
2014-11-23 17:50 ` Eli Zaretskii
2014-11-23 18:40 ` Steinar Bang
2014-11-23 19:49 ` Eli Zaretskii
2014-11-22 22:28 ` Stefan Monnier
2014-11-22 23:02 ` Lars Magne Ingebrigtsen
2014-11-23 0:22 ` Stephen J. Turnbull
2014-11-23 8:01 ` David Kastrup
2014-11-23 16:08 ` Eli Zaretskii
2014-11-23 16:29 ` Achim Gratz
2014-11-23 17:49 ` Eli Zaretskii
2014-11-23 16:29 ` David Kastrup
2014-11-23 16:42 ` Stephen J. Turnbull
2014-11-23 16:49 ` David Kastrup
2014-11-23 17:33 ` Eli Zaretskii
2014-11-23 16:41 ` Steinar Bang
2014-11-23 14:22 ` Lars Magne Ingebrigtsen
2014-11-23 15:08 ` Ken Brown
2014-11-23 15:11 ` Stephen J. Turnbull
2014-11-23 15:21 ` Lars Magne Ingebrigtsen
2014-11-24 15:11 ` Eli Zaretskii
2014-11-24 18:18 ` Stephen J. Turnbull
2014-11-24 18:26 ` Eli Zaretskii
2014-11-24 18:59 ` Stephen J. Turnbull
2014-11-24 19:06 ` Eli Zaretskii
2014-11-23 3:46 ` Eli Zaretskii
2014-11-24 3:59 ` Stefan Monnier
2014-11-24 13:09 ` Eli Zaretskii
2014-11-22 15:57 ` Stefan Monnier
2014-11-23 17:18 ` David Engster
2014-11-15 16:26 ` Eli Zaretskii
2014-11-15 16:34 ` David Engster
2014-11-15 17:50 ` David Kastrup
2014-11-15 18:06 ` Eli Zaretskii
2014-11-15 18:20 ` David Kastrup
2014-11-15 20:02 ` David Engster
2014-10-27 1:42 ` git transition issues David Caldwell
2014-10-27 1:55 ` Eric S. Raymond
2014-10-28 15:33 ` Glenn Morris
2014-10-28 21:16 ` Randal L. Schwartz
2014-10-28 21:31 ` Randal L. Schwartz
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83egtozeky.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=esr@thyrsus.com \
--cc=monnier@iro.umontreal.ca \
/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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).