You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by "C. Michael Pilato" <cm...@collab.net> on 2004/06/01 12:57:31 UTC
Re: svn commit: r9916 - trunk/doc/book/book
sussman@tigris.org writes:
> Author: sussman
> Date: Mon May 31 22:16:26 2004
> New Revision: 9916
>
> Modified:
> trunk/doc/book/book/ch03.xml
> Log:
> Slightly modified book patch from Eric Hanchrow <of...@blarg.net>:
>
> * doc/book/book/ch03.xml: show 'I' output in 'svn status' section.
>
>
> Modified: trunk/doc/book/book/ch03.xml
> ==============================================================================
> --- trunk/doc/book/book/ch03.xml (original)
> +++ trunk/doc/book/book/ch03.xml Mon May 31 22:16:26 2004
> @@ -802,6 +802,7 @@
> ? foo.o # svn doesn't manage foo.o
> ! some_dir # svn manages this, but it's either missing or incomplete
> ~ qux # versioned as dir, but is file, or vice versa
> +I .screenrc # this file is ignored
> A + moved_dir # added with history of where it came from
> M + moved_dir/README # added with history and has local modifications
> D stuff/fish.c # this file is scheduled for deletion
This breaks the example. 'svn status' will not show 'I' output unless
--no-ignores is passed to it. If you plan to show 'I' output in the
example, you should have the example use --no-ignores.
> @@ -912,6 +913,19 @@
> and created a directory in its place, without using the
> <command>svn delete</command> or <command>svn add</command>
> commands.</para>
> + </listitem>
> + </varlistentry>
> +
> + <varlistentry>
> + <term><computeroutput>I file_or_dir</computeroutput></term>
> + <listitem>
> + <para>Subversion is <quote>ignoring</quote> the file or
> + directory <filename>file_or_dir</filename>, probably
> + because you told it to. For more information on ignored
> + files, see <xref linkend="svn-ch-7-sect-2.3.3"/>.
> + Note that this symbol only shows up if you pass the
> + <option>--no-ignore</option> option to <command>svn
> + status</command>.</para>
> </listitem>
> </varlistentry>
See, you even said you yourself. :-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r9916 - trunk/doc/book/book
Posted by "C. Michael Pilato" <cm...@collab.net>.
Ben Collins-Sussman <su...@collab.net> writes:
> On Tue, 2004-06-01 at 07:57, C. Michael Pilato wrote:
>
> > > ? foo.o # svn doesn't manage foo.o
> > > ! some_dir # svn manages this, but it's either missing or incomplete
> > > ~ qux # versioned as dir, but is file, or vice versa
> > > +I .screenrc # this file is ignored
> > > A + moved_dir # added with history of where it came from
> > > M + moved_dir/README # added with history and has local modifications
> > > D stuff/fish.c # this file is scheduled for deletion
> >
> >
> > This breaks the example. 'svn status' will not show 'I' output unless
> > --no-ignores is passed to it. If you plan to show 'I' output in the
> > example, you should have the example use --no-ignores.
>
> Hmmm. Then my official opinion is that we just toss the "$ svn status"
> line. Stop pretending this is *literal* output... just say it's a list
> of the different things the status command *can* print, depending on how
> it's invoked.
+1. *Every time* I see that block in the book, it looks very much
like a tabular description of status code, and very much *not* like
real-world status output. I'd almost go so far as to say we should
just toss the example wholesale since we have a table describing the
codes, but there is benefit in seeing how status looks when it is run.
So I'm going to suggest instead that we break that "example" up into
several examples that actually resemble real-world scenarios.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r9916 - trunk/doc/book/book
Posted by Ben Collins-Sussman <su...@collab.net>.
On Tue, 2004-06-01 at 07:57, C. Michael Pilato wrote:
> > ? foo.o # svn doesn't manage foo.o
> > ! some_dir # svn manages this, but it's either missing or incomplete
> > ~ qux # versioned as dir, but is file, or vice versa
> > +I .screenrc # this file is ignored
> > A + moved_dir # added with history of where it came from
> > M + moved_dir/README # added with history and has local modifications
> > D stuff/fish.c # this file is scheduled for deletion
>
>
> This breaks the example. 'svn status' will not show 'I' output unless
> --no-ignores is passed to it. If you plan to show 'I' output in the
> example, you should have the example use --no-ignores.
Hmmm. Then my official opinion is that we just toss the "$ svn status"
line. Stop pretending this is *literal* output... just say it's a list
of the different things the status command *can* print, depending on how
it's invoked.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org