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: Emacs-23 release branch Date: Thu, 11 Mar 2010 06:21:43 +0200 Message-ID: <83y6hz1oa0.fsf@gnu.org> References: <83aaug2hkm.fsf@gnu.org> <8363542h2m.fsf@gnu.org> <877hpk3qs4.fsf@telefonica.net> <83zl2f25ps.fsf@gnu.org> <87y6hz3jmz.fsf@telefonica.net> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE X-Trace: dough.gmane.org 1268281376 25260 80.91.229.12 (11 Mar 2010 04:22:56 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 11 Mar 2010 04:22:56 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?utf-8?Q?=C3=93scar_Fuentes?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 11 05:22:51 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1NpZv9-0007H8-8a for ged-emacs-devel@m.gmane.org; Thu, 11 Mar 2010 05:22:51 +0100 Original-Received: from localhost ([127.0.0.1]:48355 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NpZv8-0000kN-Ij for ged-emacs-devel@m.gmane.org; Wed, 10 Mar 2010 23:22:50 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NpZv3-0000k0-6G for emacs-devel@gnu.org; Wed, 10 Mar 2010 23:22:45 -0500 Original-Received: from [140.186.70.92] (port=55471 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NpZv2-0000jn-As for emacs-devel@gnu.org; Wed, 10 Mar 2010 23:22:44 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NpZv1-0002tS-G0 for emacs-devel@gnu.org; Wed, 10 Mar 2010 23:22:44 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:54013) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NpZv1-0002tM-72 for emacs-devel@gnu.org; Wed, 10 Mar 2010 23:22:43 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0KZ300800O1DO900@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Thu, 11 Mar 2010 06:21:40 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.126.34.234]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KZ3008UXO43C220@a-mtaout22.012.net.il>; Thu, 11 Mar 2010 06:21:40 +0200 (IST) In-reply-to: <87y6hz3jmz.fsf@telefonica.net> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:121804 Archived-At: > From: =C3=93scar Fuentes > Date: Wed, 10 Mar 2010 23:19:00 +0100 >=20 > Eli Zaretskii writes: >=20 > >> >> Are there any bzr commands to show what revision on the (remo= te) trunk > >> >> was the parent of this branch? > >> > > >> > In case it wasn't clear, I meant _without_ checking out the br= anch. > >>=20 > >> I think your best bet is=20 > >>=20 > >> bzr missing --mine-only sftp://bzr.sv.gnu.org/srv/bzr/emacs/emac= s-23 > > > > Doesn't seem to work: > > > > eliz@fencepost:~/bzr/emacs/trunk$ bzr missing --mine-only sftp:= //eliz@bzr.savannah.gnu.org/srv/bzr/emacs/emacs-23 > > This branch is up to date. >=20 > Did you `bzr update' your local mirror first? No. Why should I? > Maybe `bzr missing' does not work with bound branches. It does work. Just "bzr missing" in the trunk shows me the few revisions I don't have, which had been added to the repository since my last update. > My trunk mirror is not bound, and after a `bzr pull' the `bzr missi= ng' > method above shows that the oldest revision that the emacs-23 branc= h is > missing is >=20 > revno: 99635 [merge] > committer: Stefan Monnier > branch nick: trunk > timestamp: Wed 2010-03-10 00:18:51 -0500 > message: > Merge pending branch >=20 > which means that the branch was created from revision 99634. I hoped for a more direct evidence, something like the way "bzr log" shows branches and merges. > > Can't "bzr log" help here? It should show branches, right? >=20 > No. Branching is copying the full history. You get a clone of the > original branch (actually, there is a `clone' bzr command that is > synonymous of `branch') The original branch does not reflect that a > clone was spawned, nor the cloned branch remembers the tip revision= . There's probably something I miss here: "bzr log -n0" does show, for all the merged branches, both their branch point and their merge point. And if that's not enough, the major revno number in the X.Y.Z revno notation is precisely the number of the revision that is the parent of the branch. Here's an example: 99599: Kenichi Handa 2010-03-02 [merge] Fix handling of the multiby= te form... 99322.1.39: Kenichi Handa 2010-03-02 [merge] from trunk 99322.1.38: Kenichi Handa 2010-03-02 Fix handling of the multibyt= e form ... 99598: Glenn Morris 2010-03-01 Small tweaks to etc/refcards/Makefil= e rules... 99322 is the revno from which Handa-san made his quickfixes branch.