Re: preventing disturbance of branch tags.

[Derek R. Price]

Stephen Cameron wrote:

> --- "Derek R. Price" <dprice@collab.net> wrote:
> > Stephen Cameron wrote:
> >
> > > Hi folks,
> > >
> > > I've updated my patch to "cvs tag/rtag" with sanity.sh test cases,
> > ChangeLog
> > > entries, cvs.texinfo changes...  I think it's done, but more eyes looking
> > it
> > > over couldn't hurt.
> > >
> > > It's here:
> > > http://www.geocities.com/dotslashstar/branch_patch.html#tagpatch
> > > Or the patch itself:
> > > http://www.geocities.com/dotslashstar/tagpatch.06.06.2001.txt
> >
> > I checked this in.  Or rather, I checked in the version you had posted this
> > morning with a few bug fixes, new error messages, and new/fixed sanity test
> > cases.
>
> Well, that surprised me!  (especially, since I noted that that one was 
> core'ing
> and I didn't send mail to bug-cvs this morning because of that but ok, looks
> like you found the missing return 0 that caused that problem.  I've since
> removed that version from that page...

I was just getting around to reviewing your email from the day before and found
the new patch.  :)  I misunderstood the part about coring too, I thought you had
fixed it already but spotted the missing returns (I think there were two) during
my code review.


> > The bug fix I mention was adding a couple of "return (0);"'s where they were
> > missing and changing the operation of '-B' to strictly allowing the source
> > tag to
> > be a branch (and forbidding it when missing).  This seemed simpler and more
> > consistent.
>
> Ok.  AS I was trying to document it, it seemed that using cvs tag to disturb a
> branch tag might only do something sensible if what you are trying to do is
> convert a branch tag to a non-branch tag.

No, it makes sense to require it when moving a branch to a new branch, because 
the
tag _is_ deleted off of the old branch - exactly what we agreed the user should 
be
discouraged from doing, I think?


> I put that table in there because it
> was not obvious with all the permutations what would happen, so I thought it
> would be a good idea to spell it out explicitly.  (BTW, I think I got one row
> of that table wrong, a moot point now.)
>
> > I did use the ChangeLog messages from the new patch, but a cursory 
> > inspection
> > showed that the only other differences were in cvs.texinfo, and I preferred
> > the
> > first version of that with my changes.  The table you provided no longer
> > applies
> > after my bug fix and you were going to leave me a lot of reformatting to do
> > since
> > you neglected to use texinfo tags.
>
> Yeah, my texinfo style is monkey-see-monkey-do, at best.

So's mine, I've just been doing it a little longer.  Some of the basics are
@code{} for command snippets, @var{} for variables, in command snippets or
elsewhere, @file{} for filenames, @samp{} (sample) for most anything else you 
need
quotes around (often misused for command snippets, yet), @example ... @end 
example
for formmatted chunks, @emph{} for emphasis - warnings or whatever - this will 
be
bracketed by underline characters in info files (_ ... _) and in italics in PDF 
&
probably postscript & HTML.  Oh, @noindent can ocassionally be useful too, after
examples and the like.  Then of course there's @cindex ... to add tags for the
index.

Also, I noted that your table was huge (>80 characters per line).  The info
viewer, at least, will wrap lines dependant on the terminal setting, so you can
probably only count on some number like 72 or 80 characters per line when
attempting to use formatted text like that.

That's probably enough to get by my inspection since that's all I can remember 
off
the top of my head.  Well, there's node creation and crosslinks and the like, 
but
you can glance through the file when you need that.  Oh, @pxref{} in parens and
@xref{} outside.


> > If you want to take a second shot at correcting our poor english and manual
> > organization, go ahead, but try and use the texinfo tags.  One hint is that
> > if you
> > want to put something in quotes, you should probably be using a tag, and
> > CVS should be written @sc{cvs}.
> >
> > Thanks for the patch!
>
> You're welcome.  Thanks for taking the time to look at it.
>
> -- steve

:)

Derek

--
Derek Price                      CVS Solutions Architect ( http://CVSHome.org )
mailto:dprice@collab.net         CollabNet ( http://collab.net )
--
Honesty is the 1st chapter in the book of wisdom.