You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Ryan Barrett <ry...@REMOVED> on 2004/03/15 10:23:14 UTC
[BOOK PATCH] svn up 'G' status character
hi subversion gurus! first, ten thousand thanks for subversion. it rocks.
second, i have a humble suggestion for the book. the svn up reference
doesn't list the 'G' status character, which (from what i can tell) is
used for files that have local changes which are identical to the changes
in HEAD. i think this is only applicable to svn up, since a subsequent svn
st won't list them, as expected.
out of curiosity, what does G stand for here?
-Ryan
--
"Woooo!" -Twinsen
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [BOOK PATCH] svn up 'G' status character
Posted by "C. Michael Pilato" <cm...@collab.net>.
Ryan Barrett writes:
> hi subversion gurus! first, ten thousand thanks for subversion. it rocks.
>
> second, i have a humble suggestion for the book. the svn up reference
> doesn't list the 'G' status character, which (from what i can tell) is
> used for files that have local changes which are identical to the changes
> in HEAD. i think this is only applicable to svn up, since a subsequent svn
> st won't list them, as expected.
>
> out of curiosity, what does G stand for here?
merGed.
It means that the update process modified a file that you also had
locally modified, in a way that didn't conflict.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [BOOK PATCH] svn up 'G' status character
Posted by Ben Collins-Sussman <su...@collab.net>.
On Mon, 2004-03-15 at 14:31, Ryan Barrett wrote:
> On Mon, 15 Mar 2004, Brian W. Fitzpatrick wrote:
>
> > PS It's customary to use the word "PATCH" in the subject only when the
> > message actually has a PATCH attached to it. :-)
>
> hehe, agreed. however, i figured the pdf and html were generated, and even
> if they weren't, damned if i knew how to make a usable patch to a pdf. :P
> so, the patch was inlined in a somewhat awkward but human-friendly format.
>
> do you actually get real patches? if so, against what?
Against the Docbook-XML sourcecode:
http://svn.collab.net/repos/svn/trunk/doc/book/book/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [BOOK PATCH] svn up 'G' status character
Posted by Ryan Barrett <ry...@REMOVED>.
On Mon, 15 Mar 2004, Brian W. Fitzpatrick wrote:
> PS It's customary to use the word "PATCH" in the subject only when the
> message actually has a PATCH attached to it. :-)
hehe, agreed. however, i figured the pdf and html were generated, and even
if they weren't, damned if i knew how to make a usable patch to a pdf. :P
so, the patch was inlined in a somewhat awkward but human-friendly format.
do you actually get real patches? if so, against what?
-Ryan
--
"Woooo!!!" -Twinsen
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [BOOK PATCH] svn up 'G' status character
Posted by "Brian W. Fitzpatrick" <fi...@red-bean.com>.
On Mon, 2004-03-15 at 04:23, Ryan Barrett wrote:
> hi subversion gurus! first, ten thousand thanks for subversion. it rocks.
>
> second, i have a humble suggestion for the book. the svn up reference
> doesn't list the 'G' status character, which (from what i can tell) is
> used for files that have local changes which are identical to the changes
> in HEAD. i think this is only applicable to svn up, since a subsequent svn
> st won't list them, as expected.
>
> out of curiosity, what does G stand for here?
Fixed this error in the book in revision 9064. Thanks!
-Fitz
PS It's customary to use the word "PATCH" in the subject only when the
message actually has a PATCH attached to it. :-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org