Date: Wed, 4 Jun 2014 15:34:42 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r45008 - head/en_US.ISO8859-1/articles/committers-guide Message-ID: <201406041534.s54FYgx9063227@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Wed Jun 4 15:34:42 2014 New Revision: 45008 URL: http://svnweb.freebsd.org/changeset/doc/45008 Log: Document that zsh users should escape '^' when using the '^/head' subversion syntax for merging. Sponsored by: The FreeBSD Foundation Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- head/en_US.ISO8859-1/articles/committers-guide/article.xml Wed Jun 4 14:08:04 2014 (r45007) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Wed Jun 4 15:34:42 2014 (r45008) @@ -1870,6 +1870,14 @@ U stable/9/share/man/man4/netmap.4 repository path.</para> </tip> + <note> + <para>If using the <application>Zsh</application> shell, + the <literal>^</literal> must be escaped with + <literal>\</literal>. This means + <literal>^/head</literal> should be + <literal>\^/head</literal>.</para> + </note> + <para>It is necessary to resolve any merge conflicts. This process is the same in <acronym>SVN</acronym> as in <acronym>CVS</acronym>.</para>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406041534.s54FYgx9063227>