[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Emacs-23 release branch

From: Eli Zaretskii
Subject: Re: Emacs-23 release branch
Date: Thu, 11 Mar 2010 06:21:43 +0200

> From: Óscar Fuentes <address@hidden>
> Date: Wed, 10 Mar 2010 23:19:00 +0100
> Eli Zaretskii <address@hidden> writes:
> >> >> Are there any bzr commands to show what revision on the (remote) trunk
> >> >> was the parent of this branch?
> >> >
> >> > In case it wasn't clear, I meant _without_ checking out the branch.
> >> 
> >> I think your best bet is 
> >> 
> >> bzr missing --mine-only sftp://bzr.sv.gnu.org/srv/bzr/emacs/emacs-23
> >
> > Doesn't seem to work:
> >
> >   address@hidden:~/bzr/emacs/trunk$ bzr missing --mine-only 
> > sftp://address@hidden/srv/bzr/emacs/emacs-23
> >   This branch is up to date.
> 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 missing'
> method above shows that the oldest revision that the emacs-23 branch is
> missing is
> revno: 99635 [merge]
> committer: Stefan Monnier <address@hidden>
> branch nick: trunk
> timestamp: Wed 2010-03-10 00:18:51 -0500
> message:
>   Merge pending branch
> 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?
> 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 multibyte form...
    99322.1.39: Kenichi Handa 2010-03-02 [merge] from trunk
    99322.1.38: Kenichi Handa 2010-03-02 Fix handling of the multibyte form ...
  99598: Glenn Morris 2010-03-01 Small tweaks to etc/refcards/Makefile rules...

99322 is the revno from which Handa-san made his quickfixes branch.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]