unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
* Bzr Emacs question
@ 2012-11-24 17:02 Bill Wohler
  2012-11-24 17:34 ` Eli Zaretskii
  2012-11-24 19:50 ` Bill Wohler
  0 siblings, 2 replies; 9+ messages in thread
From: Bill Wohler @ 2012-11-24 17:02 UTC (permalink / raw)
  To: emacs-devel

I want to make an MH-E 8.3.1 release that corresponds to the Emacs 24.1
release. I thought that I would do this:

    bzr tag -r emacs-24.1 mh-e-8.3.1

But then when I run the following to get the proper workspace for
creating a release:

    bzr up -r mh-e-8.3.1

I get this error:

    bzr: ERROR: branch has no revision cyd@gnu.org-20120610074146-e2dmv3euiqbajrxt                        
    bzr update --revision only works for a revision in the branch history

What is wrong?

On a related note, what command should I use to confirm the revision of
the workspace? "svn info" provides this information but "bzr info" does
not.

-- 
Bill Wohler <wohler@newt.com> aka <Bill.Wohler@nasa.gov>
http://www.newt.com/wohler/
GnuPG ID:610BD9AD



^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: Bzr Emacs question
  2012-11-24 17:02 Bzr Emacs question Bill Wohler
@ 2012-11-24 17:34 ` Eli Zaretskii
  2012-11-24 17:47   ` Bill Wohler
  2012-11-24 18:47   ` Bill Wohler
  2012-11-24 19:50 ` Bill Wohler
  1 sibling, 2 replies; 9+ messages in thread
From: Eli Zaretskii @ 2012-11-24 17:34 UTC (permalink / raw)
  To: Bill Wohler; +Cc: emacs-devel

> Date: Sat, 24 Nov 2012 09:02:09 -0800
> From: Bill Wohler <wohler@newt.com>
> 
> I want to make an MH-E 8.3.1 release that corresponds to the Emacs 24.1
> release. I thought that I would do this:
> 
>     bzr tag -r emacs-24.1 mh-e-8.3.1
> 
> But then when I run the following to get the proper workspace for
> creating a release:
> 
>     bzr up -r mh-e-8.3.1
> 
> I get this error:
> 
>     bzr: ERROR: branch has no revision cyd@gnu.org-20120610074146-e2dmv3euiqbajrxt                        
>     bzr update --revision only works for a revision in the branch history
> 
> What is wrong?

A tag is not a revision-id by itself.  Try

  bzr up -r tag:mh-e-8.3.1

(And I'm not sure you really want "up" and not some other command, but
that's another story.)

> On a related note, what command should I use to confirm the revision of
> the workspace? "svn info" provides this information but "bzr info" does
> not.

Does "bzr revno" do what you want?



^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: Bzr Emacs question
  2012-11-24 17:34 ` Eli Zaretskii
@ 2012-11-24 17:47   ` Bill Wohler
  2012-11-24 18:12     ` Eli Zaretskii
  2012-11-24 18:47   ` Bill Wohler
  1 sibling, 1 reply; 9+ messages in thread
From: Bill Wohler @ 2012-11-24 17:47 UTC (permalink / raw)
  To: emacs-devel

Eli Zaretskii <eliz@gnu.org> writes:

>> Date: Sat, 24 Nov 2012 09:02:09 -0800
>> From: Bill Wohler <wohler@newt.com>
>> 
>> I want to make an MH-E 8.3.1 release that corresponds to the Emacs 24.1
>> release. I thought that I would do this:
>> 
>>     bzr tag -r emacs-24.1 mh-e-8.3.1
>> 
>> But then when I run the following to get the proper workspace for
>> creating a release:
>> 
>>     bzr up -r mh-e-8.3.1
>> 
>> I get this error:
>> 
>>     bzr: ERROR: branch has no revision cyd@gnu.org-20120610074146-e2dmv3euiqbajrxt                        
>>     bzr update --revision only works for a revision in the branch history
>> 
>> What is wrong?
>
> A tag is not a revision-id by itself.  Try
>
>   bzr up -r tag:mh-e-8.3.1

Not surprisingly, that produces the same error. Note that "bzr help
revisionspec" says:

    Alternately, [the revision] can be given without a keyword, in which
    case it will be checked as a revision number, a tag, a revision id,
    a date specification, or a branch specification, in that order.

> (And I'm not sure you really want "up" and not some other command, but
> that's another story.)

What would you recommend as an alternative to "svn up -r<revision>"?

>> On a related note, what command should I use to confirm the revision of
>> the workspace? "svn info" provides this information but "bzr info" does
>> not.
>
> Does "bzr revno" do what you want?

I think so. After running "bzr up -r 108549" (the master revision that
contains a merge of emacs-24.1), the --tree option was needed to show
that version. Without --tree, the version for the head of the trunk was
shown:

    $ bzr revno --tree
    108549
    $ bzr revno 
    111000

Thanks!

-- 
Bill Wohler <wohler@newt.com> aka <Bill.Wohler@nasa.gov>
http://www.newt.com/wohler/
GnuPG ID:610BD9AD




^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: Bzr Emacs question
  2012-11-24 17:47   ` Bill Wohler
@ 2012-11-24 18:12     ` Eli Zaretskii
  2012-11-24 18:22       ` Bill Wohler
  0 siblings, 1 reply; 9+ messages in thread
From: Eli Zaretskii @ 2012-11-24 18:12 UTC (permalink / raw)
  To: Bill Wohler; +Cc: emacs-devel

> From: Bill Wohler <wohler@newt.com>
> Date: Sat, 24 Nov 2012 09:47:31 -0800
> 
> > A tag is not a revision-id by itself.  Try
> >
> >   bzr up -r tag:mh-e-8.3.1
> 
> Not surprisingly, that produces the same error.

I guess I don't understand what your "bzr tag" command did.  What is
"emacs-24.1" in that command?

> Note that "bzr help revisionspec" says:
> 
>     Alternately, [the revision] can be given without a keyword, in which
>     case it will be checked as a revision number, a tag, a revision id,
>     a date specification, or a branch specification, in that order.

And you are willing to bet your life on that it guesses right? ;-)

> > (And I'm not sure you really want "up" and not some other command, but
> > that's another story.)
> 
> What would you recommend as an alternative to "svn up -r<revision>"?

I don't know, I never used SVN seriously.  What did you want to
accomplish?



^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: Bzr Emacs question
  2012-11-24 18:12     ` Eli Zaretskii
@ 2012-11-24 18:22       ` Bill Wohler
  2012-11-24 20:43         ` Eli Zaretskii
  0 siblings, 1 reply; 9+ messages in thread
From: Bill Wohler @ 2012-11-24 18:22 UTC (permalink / raw)
  To: emacs-devel

Eli Zaretskii <eliz@gnu.org> writes:

>> From: Bill Wohler <wohler@newt.com>
>> Date: Sat, 24 Nov 2012 09:47:31 -0800
>> 
>> > A tag is not a revision-id by itself.  Try
>> >
>> >   bzr up -r tag:mh-e-8.3.1
>> 
>> Not surprisingly, that produces the same error.
>
> I guess I don't understand what your "bzr tag" command did.  What is
> "emacs-24.1" in that command?

I want the mh-e-8.3.1 tag to correspond to the Emacs 24.1 release. I had
assumed, perhaps incorrectly, that the emacs-24.1 tag was what I wanted.

>> Note that "bzr help revisionspec" says:
>> 
>>     Alternately, [the revision] can be given without a keyword, in which
>>     case it will be checked as a revision number, a tag, a revision id,
>>     a date specification, or a branch specification, in that order.
>
> And you are willing to bet your life on that it guesses right? ;-)

Ha! No, but I'd bet a beer :-).

>> > (And I'm not sure you really want "up" and not some other command, but
>> > that's another story.)
>> 
>> What would you recommend as an alternative to "svn up -r<revision>"?
>
> I don't know, I never used SVN seriously.  What did you want to
> accomplish?

I want to grab the MH-E files associated with the Emacs 24.1 release in
order to make an MH-E 8.3.1 release.

Thanks very much for your help.

-- 
Bill Wohler <wohler@newt.com> aka <Bill.Wohler@nasa.gov>
http://www.newt.com/wohler/
GnuPG ID:610BD9AD




^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: Bzr Emacs question
  2012-11-24 17:34 ` Eli Zaretskii
  2012-11-24 17:47   ` Bill Wohler
@ 2012-11-24 18:47   ` Bill Wohler
  1 sibling, 0 replies; 9+ messages in thread
From: Bill Wohler @ 2012-11-24 18:47 UTC (permalink / raw)
  To: emacs-devel

Eli Zaretskii <eliz@gnu.org> writes:

>> On a related note, what command should I use to confirm the revision of
>> the workspace? "svn info" provides this information but "bzr info" does
>> not.
>
> Does "bzr revno" do what you want?

Found an even better command: bzr version-info.

-- 
Bill Wohler <wohler@newt.com> aka <Bill.Wohler@nasa.gov>
http://www.newt.com/wohler/
GnuPG ID:610BD9AD




^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: Bzr Emacs question
  2012-11-24 17:02 Bzr Emacs question Bill Wohler
  2012-11-24 17:34 ` Eli Zaretskii
@ 2012-11-24 19:50 ` Bill Wohler
  1 sibling, 0 replies; 9+ messages in thread
From: Bill Wohler @ 2012-11-24 19:50 UTC (permalink / raw)
  To: emacs-devel

Bill Wohler <wohler@newt.com> writes:

> I want to make an MH-E 8.3.1 release that corresponds to the Emacs 24.1
> release. I thought that I would do this:
>
>     bzr tag -r emacs-24.1 mh-e-8.3.1
>
> But then when I run the following to get the proper workspace for
> creating a release:
>
>     bzr up -r mh-e-8.3.1
>
> I get this error:
>
>     bzr: ERROR: branch has no revision cyd@gnu.org-20120610074146-e2dmv3euiqbajrxt                        
>     bzr update --revision only works for a revision in the branch history
>
> What is wrong?

While I still don't understand why I got this error, I think I found a
good enough solution. The emacs-24.1 tag is set to 107781.1.251. Since
there weren't any MH-E changes on the 107781.1 branch of note, I set the
mh-e-8.3.1 tag to its base version of 107781. I was then able to get a
workspace that was close enough to the Emacs 24.1 release for my needs.

Thanks again, Eli!

-- 
Bill Wohler <wohler@newt.com> aka <Bill.Wohler@nasa.gov>
http://www.newt.com/wohler/
GnuPG ID:610BD9AD




^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: Bzr Emacs question
  2012-11-24 18:22       ` Bill Wohler
@ 2012-11-24 20:43         ` Eli Zaretskii
  2012-11-24 20:49           ` Bill Wohler
  0 siblings, 1 reply; 9+ messages in thread
From: Eli Zaretskii @ 2012-11-24 20:43 UTC (permalink / raw)
  To: Bill Wohler; +Cc: emacs-devel

> From: Bill Wohler <wohler@newt.com>
> Date: Sat, 24 Nov 2012 10:22:28 -0800
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> 
> >> From: Bill Wohler <wohler@newt.com>
> >> Date: Sat, 24 Nov 2012 09:47:31 -0800
> >> 
> >> > A tag is not a revision-id by itself.  Try
> >> >
> >> >   bzr up -r tag:mh-e-8.3.1
> >> 
> >> Not surprisingly, that produces the same error.
> >
> > I guess I don't understand what your "bzr tag" command did.  What is
> > "emacs-24.1" in that command?
> 
> I want the mh-e-8.3.1 tag to correspond to the Emacs 24.1 release. I had
> assumed, perhaps incorrectly, that the emacs-24.1 tag was what I wanted.

In what branch did you issue that "bzr tag" command?

> >> > (And I'm not sure you really want "up" and not some other command, but
> >> > that's another story.)
> >> 
> >> What would you recommend as an alternative to "svn up -r<revision>"?
> >
> > I don't know, I never used SVN seriously.  What did you want to
> > accomplish?
> 
> I want to grab the MH-E files associated with the Emacs 24.1 release in
> order to make an MH-E 8.3.1 release.

If you want to update the tree to a certain revision, I think
"bzr revert" is a better choice, because "update" will leave any
uncommitted changes you might have.



^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: Bzr Emacs question
  2012-11-24 20:43         ` Eli Zaretskii
@ 2012-11-24 20:49           ` Bill Wohler
  0 siblings, 0 replies; 9+ messages in thread
From: Bill Wohler @ 2012-11-24 20:49 UTC (permalink / raw)
  To: Eli Zaretskii; +Cc: emacs-devel

Eli Zaretskii <eliz@gnu.org> wrote:

> > From: Bill Wohler <wohler@newt.com>
> > Date: Sat, 24 Nov 2012 10:22:28 -0800
> > 
> > Eli Zaretskii <eliz@gnu.org> writes:
> > 
> > >> From: Bill Wohler <wohler@newt.com>
> > >> Date: Sat, 24 Nov 2012 09:47:31 -0800
> > >> 
> > >> > A tag is not a revision-id by itself.  Try
> > >> >
> > >> >   bzr up -r tag:mh-e-8.3.1
> > >> 
> > >> Not surprisingly, that produces the same error.
> > >
> > > I guess I don't understand what your "bzr tag" command did.  What is
> > > "emacs-24.1" in that command?
> > 
> > I want the mh-e-8.3.1 tag to correspond to the Emacs 24.1 release. I had
> > assumed, perhaps incorrectly, that the emacs-24.1 tag was what I wanted.
> 
> In what branch did you issue that "bzr tag" command?

trunk.

I also tried creating a branch of emacs-24, but got the same error
there.

> > >> > (And I'm not sure you really want "up" and not some other command, but
> > >> > that's another story.)
> > >> 
> > >> What would you recommend as an alternative to "svn up -r<revision>"?
> > >
> > > I don't know, I never used SVN seriously.  What did you want to
> > > accomplish?
> > 
> > I want to grab the MH-E files associated with the Emacs 24.1 release in
> > order to make an MH-E 8.3.1 release.
> 
> If you want to update the tree to a certain revision, I think
> "bzr revert" is a better choice, because "update" will leave any
> uncommitted changes you might have.

OK, thanks!

-- 
Bill Wohler <wohler@newt.com> aka <Bill.Wohler@nasa.gov>
http://www.newt.com/wohler/
GnuPG ID:610BD9AD



^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2012-11-24 20:49 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-11-24 17:02 Bzr Emacs question Bill Wohler
2012-11-24 17:34 ` Eli Zaretskii
2012-11-24 17:47   ` Bill Wohler
2012-11-24 18:12     ` Eli Zaretskii
2012-11-24 18:22       ` Bill Wohler
2012-11-24 20:43         ` Eli Zaretskii
2012-11-24 20:49           ` Bill Wohler
2012-11-24 18:47   ` Bill Wohler
2012-11-24 19:50 ` Bill Wohler

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).