Re: sh-script.el: Doc-string spelling fix (minor)

Re: sh-script.el: Doc-string spelling fix (minor)

[Bastien]

Bastien <bzg@altern.org> writes:

> Bill Meier <wmeier@newsguy.com> writes:
>
>> Index: lisp/progmodes/sh-script.el
>> ===================================================================
>> RCS file: /sources/emacs/emacs/lisp/progmodes/sh-script.el,v
>> retrieving revision 1.194.2.6
>> diff -r1.194.2.6 sh-script.el
>> 1215c1215
>> < a number means align to that column, e.g. 0 means fist column."
>> ---
>>> a number means align to that column, e.g. 0 means first column."
>
> Fixed in the EMACS_PRETEST_22_1_91 branch, thanks.

Huh.  While trying to commit the fix, I get this error:

cvs commit: sticky tag `EMACS_PRETEST_22_1_91' for file `lisp/ChangeLog' is not a branch
cvs commit: sticky tag `EMACS_PRETEST_22_1_91' for file `lisp/progmodes/sh-script.el' is not a branch

I previously checked the branch with:

cvs -z3 -d:ext:bastien1@cvs.savannah.gnu.org:/sources/emacs co -r EMACS_PRETEST_22_1_91 emacs

What did I do wrong? 

-- 
Bastien

Re: sh-script.el: Doc-string spelling fix (minor)

[Miles Bader]

Bastien <bzg@altern.org> writes:
> cvs -z3 -d:ext:bastien1@cvs.savannah.gnu.org:/sources/emacs co -r EMACS_PRETEST_22_1_91 emacs
>
> What did I do wrong? 

Tried to commit to a non-branch tag (I dunno why the original poster
used the phrase "EMACS_PRETEST_22_1_91 branch", but it's not really
correct).

You should be using the usual emacs-22 branch tag instead, EMACS_22_BASE
(which is confusingly misnamed, but it's the correct thing to use).

-Miles

-- 
Opposition, n. In politics the party that prevents the Goverment from running
amok by hamstringing it.

Re: sh-script.el: Doc-string spelling fix (minor)

[Miles Bader]

Miles Bader <miles.bader@necel.com> writes:
> (I dunno why the original poster used the phrase
> "EMACS_PRETEST_22_1_91 branch", but it's not really correct).

Oh wait, the original poster was you... :-)

-Miles

-- 
Generous, adj. Originally this word meant noble by birth and was rightly
applied to a great multitude of persons. It now means noble by nature and is
taking a bit of a rest.

Re: sh-script.el: Doc-string spelling fix (minor)

[Stefan Monnier]

> cvs -z3 -d:ext:bastien1@cvs.savannah.gnu.org:/sources/emacs co -r EMACS_PRETEST_22_1_91 emacs

> What did I do wrong? 

The EMACS_PRETEST_22_1_91 tag is not a branch tag.  It refers to one
particular revision and cannot be changed (except via `tag -F' like
commands).  Do the following:

> cd .../emacs
> cvs update -r EMACS_22_BASE

which will select the branch on which the revision EMACS_PRETEST_22_1_91
sits (and on which subsequent pretests will be made as well).


        Stefan

Re: sh-script.el: Doc-string spelling fix (minor)

[Bastien Guerry]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

>> cvs -z3 -d:ext:bastien1@cvs.savannah.gnu.org:/sources/emacs co -r EMACS_PRETEST_22_1_91 emacs
>
>> What did I do wrong? 
>
> The EMACS_PRETEST_22_1_91 tag is not a branch tag.  It refers to one
> particular revision and cannot be changed (except via `tag -F' like
> commands).  Do the following:
>
>> cd .../emacs
>> cvs update -r EMACS_22_BASE
>
> which will select the branch on which the revision EMACS_PRETEST_22_1_91
> sits (and on which subsequent pretests will be made as well).

Thanks for the explanations, I've done that.

-- 
Bastien