Re: git transition issues

[Eli Zaretskii]

> Date: Fri, 31 Oct 2014 06:51:42 -0400
> From: "Eric S. Raymond" <address@hidden>
> Cc: address@hidden, address@hidden
> 
> > > 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 <address@hidden>
> 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: address@hidden
  parent: address@hidden
  fixes bug: http://debbugs.gnu.org/18884
  committer: Jan D. <address@hidden>
  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://address@hidden/emacs/emacs-24/

(Assuming your savannah username is esr; if not, change accordingly).
Does this show revno 117637 as missing upstream?