bug-cvs
[Top][All Lists]
Advanced

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

Re: cvs.texinfo updates? add/remove


From: Kevin R. Bulgrien
Subject: Re: cvs.texinfo updates? add/remove
Date: Sat, 12 Aug 2006 21:38:05 -0500
User-agent: KMail/1.8.2

> Hi Kevin,
> 
> makeinfo 4.8 does not like your patch.
> 
> % make cvs.info
> cvs.texinfo:11721: `remove' has no Up field (perhaps incorrect sectioning?).
> cvs.texinfo:9023: `add' has no Up field (perhaps incorrect sectioning?).
> makeinfo: Removing output file `cvs.info' due to errors; use --force to 
> preserve.
> %
> 
> So, you still have a bit of work to do before your patch may be used.
> 
> My guess is that you need a patch like this one:
> 
> @@ -8248,6 +8248,7 @@ reference to @sc{cvs} commands, @pxref{I
>  * Global options::              Options you give to the left of cvs_command
>  * Common options::              Options you give to the right of cvs_command
>  * Date input formats::               Acceptable formats for date 
> specifications
> +* add::                         Adding new files and directories
>  * admin::                       Administration
>  * annotate & rannotate::        What revision modified each line of a file?
>  * checkout::                    Checkout sources for editing
> @@ -8260,6 +8261,7 @@ reference to @sc{cvs} commands, @pxref{I
>  * ls & rls::                    List files in the repository
>  * rdiff::                       'patch' format diffs between releases
>  * release::                     Indicate that a directory is no longer in use
> +* remove::                      Removing files
>  * server & pserver::            Act as a server for a client on stdin/stdout
>  * sign::                        Attach new OpenPGP revision signature
>  * tag & rtag::                  Mark project snapshot for later retrieval
> 
> but I have not looked closely to determine if that works in the flow of
> both the manual and the man page.

What is the correct way for me to "test" the patch so that I can avoid wasting
your time with one that does not work?  Make clean/all in the doc directory,
or is there more to it than that?
 
> More comments in-line. Others may also have comments.
>
> > +The @code{add} command is used to present new files
> > +and directories for addition into the @sc{cvs}
> > +repository.  When @code{add} is used on a directory,
> > +a new directory is created in the repository
> > +immediately.  When used on a file, only the working
> > +directory is updated.  Changes to the repository are
> > +not made until the @code{commit} command is used on
> > +the newly added file.
> > +
> > +The @code{add} command also resurrects files that
> > +have been removed but not committed.  Resurrected
> > +files are restored into the working directory at the
> > +time the @code{add} command is executed.
> 
> This is not a completely true statement. The add command may ressurrect
> a previously removed file as well. Consider this example:
> 
>     $ cvs -d /tmp/mdb.repos init
>     $ cvs -d /tmp/mdb.repos co -d top .
>     cvs checkout: Updating top
>     cvs checkout: Updating top/CVSROOT
>     U top/CVSROOT/checkoutlist
>     U top/CVSROOT/commitinfo
>     U top/CVSROOT/config
>     U top/CVSROOT/cvswrappers
>     U top/CVSROOT/editinfo
>     U top/CVSROOT/loginfo
>     U top/CVSROOT/modules
>     U top/CVSROOT/notify
>     U top/CVSROOT/rcsinfo
>     U top/CVSROOT/taginfo
>     U top/CVSROOT/verifymsg
>     $ cd top
>     $ mkdir foo && cvs add foo
>     Directory /tmp/mdb.repos/foo added to the repository
>     $ cd foo
>     $ echo hello > hello.txt
>     $ cvs add hello.txt
>     cvs add: scheduling file `hello.txt' for addition
>     cvs add: use 'cvs commit' to add this file permanently
>     $ cvs ci -madd hello.txt
>     RCS file: /tmp/mdb.repos/foo/hello.txt,v
>     done
>     Checking in hello.txt;
>     /tmp/mdb.repos/foo/hello.txt,v  <--  hello.txt
>     initial revision: 1.1
>     done
>     $ cvs rm -f hello.txt
>     cvs remove: scheduling `hello.txt' for removal
>     cvs remove: use 'cvs commit' to remove this file permanently
>     $ cvs ci -mremove hello.txt
>     Removing hello.txt;
>     /tmp/mdb.repos/foo/hello.txt,v  <--  hello.txt
>     new revision: delete; previous revision: 1.1
>     done
>     $ cvs add hello.txt
>     cvs add: Resurrecting file `hello.txt' from revision 1.1.
>     U hello.txt
>     cvs add: Re-adding file `hello.txt' (in place of dead revision 1.2).
>     cvs add: use 'cvs commit' to add this file permanently
>     $ cat hello.txt
>     hello
>     $ cvs ci -mre-add hello.txt
>     Checking in hello.txt;
>     /tmp/mdb.repos/foo/hello.txt,v  <--  hello.txt
>     new revision: 1.3; previous revision: 1.2
>     done
>     $
> 
> So, it may be desirable to reword your paragraph somewhat.

Yes it sounds like it.  Thank you for catching that, and for teaching me
something I did not know.  Oddly enough, that corrects a mistaken
assumption I just made this week, and allows me to reconsider a
course of action I was about to take.
 
> > +In addition, these options are also supported:
> > +
> > address@hidden @code
> > address@hidden -f
> > +Note that this is not the standard behavior of
> > +the @samp{-f} option as defined in @ref{Common options}.
> > +
> > +Delete the file before removing it.
> 
> It is worth noting that you may specify an entire directory with the -f
> option and mark the entire hierarchy for deletion at the next commit.
 
Noted.  I will work that in.

Thanks for comments.

Kevin R. Bulgrien
http://kbulgrien.home.att.net/




reply via email to

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