[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Book: patch to appendix A by Francois Beausoleil: issue 1187

From: Francois Beausoleil <fbos_at_users.sourceforge.net>
Date: 2003-08-05 19:04:46 CEST

Ok, I will update the patch this week.

Thanks,
François

On Tue, 05 Aug 2003 16:12:53 +0100, "Julian Foad"
<julianfoad@btopenworld.com> said:
> Francois Beausoleil:
>
> You posted some book fixes in March, and they were filed as issue 1187.
> I'm sorry that they had to wait such a long time. I have just committed
> all of your fixes except for the following change to appa.xml:
>
> @@ -289,13 +289,13 @@
> see:</para>
>
> <screen>
> -A Add
> -D Delete
> -R Replace (delete, then re-add)
> -M local Modification
> -U Updated
> -G merGed
> -C Conflict
> +A Scheduled for addition
> +D Scheduled for deletion
> +M Has local modifications
> +C Has conflicts
> +? Item not under version control
> +! Item is missing
> +~ Conflict between kind (file as a folder or vice versa)
> X eXternal
> </screen>
>
> The existing list appears to be a combination of "status" and "update"
> codes. If you were intending to change it to a list of "status" codes
> only, then you probably need to add a list of "update" codes after it,
> since the following paragraph refers to "update" codes.
>
> Also note that "R" is a valid "status" code.
>
> I don't think we want a comprehensive list of all the possibilities here,
> because that would just duplicate information from elsewhere in the book.
> Instead it might be better to say "here are the most common codes" (I
> suggest omitting "!", "~" and "X") and then refer to the tutorial and
> reference sections for "status" and "update".
>
> If you would like to do something like that, that would be great.
>
> - Julian
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
>
Developer of Java Gui Builder
http://jgb.sourceforge.net/

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Aug 5 19:06:58 2003

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.