From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: git transition issues Date: Fri, 31 Oct 2014 13:03:09 +0200 Message-ID: <83egtozeky.fsf@gnu.org> References: <20141027012827.GA10163@thyrsus.com> <20141028163655.GB10490@thyrsus.com> <8361f42hw9.fsf@gnu.org> <20141028180738.GA13564@thyrsus.com> <8338a82h1g.fsf@gnu.org> <83ioj0zjgn.fsf@gnu.org> <20141031102322.GB26371@thyrsus.com> <83fve4zg8m.fsf@gnu.org> <20141031105142.GA27981@thyrsus.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1414775306 14578 80.91.229.3 (31 Oct 2014 17:08:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 31 Oct 2014 17:08:26 +0000 (UTC) Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org To: esr@thyrsus.com Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Oct 31 18:08:07 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XkFgD-0004p3-E6 for ged-emacs-devel@m.gmane.org; Fri, 31 Oct 2014 18:08:05 +0100 Original-Received: from localhost ([::1]:39524 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkFgC-00048Q-Pm for ged-emacs-devel@m.gmane.org; Fri, 31 Oct 2014 13:08:04 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39509) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkDlk-0007qL-8G for emacs-devel@gnu.org; Fri, 31 Oct 2014 11:05:56 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xk9z9-0002vn-Ak for emacs-devel@gnu.org; Fri, 31 Oct 2014 07:03:21 -0400 Original-Received: from mtaout26.012.net.il ([80.179.55.182]:35538) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xk9z8-0002tx-Tp for emacs-devel@gnu.org; Fri, 31 Oct 2014 07:03:15 -0400 Original-Received: from conversion-daemon.mtaout26.012.net.il by mtaout26.012.net.il (HyperSendmail v2007.08) id <0NEB00F002G36E00@mtaout26.012.net.il> for emacs-devel@gnu.org; Fri, 31 Oct 2014 13:01:40 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout26.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NEB00BU72MSOI30@mtaout26.012.net.il>; Fri, 31 Oct 2014 13:01:40 +0200 (IST) In-reply-to: <20141031105142.GA27981@thyrsus.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.182 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:176092 Archived-At: > Date: Fri, 31 Oct 2014 06:51:42 -0400 > From: "Eric S. Raymond" > 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 > 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. 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?