hgbook

diff en/ch13-mq-collab.xml @ 647:d0160b0b1a9e

Merge with http://hg.serpentine.com/mercurial/book
author Dongsheng Song <dongsheng.song@gmail.com>
date Wed Mar 18 20:32:37 2009 +0800 (2009-03-18)
parents cfdb601a3c8b 8366882f67f2
children
line diff
     1.1 --- a/en/ch13-mq-collab.xml	Thu Mar 12 15:51:39 2009 +0800
     1.2 +++ b/en/ch13-mq-collab.xml	Wed Mar 18 20:32:37 2009 +0800
     1.3 @@ -460,8 +460,9 @@
     1.4  	  role="hg-ext">extdiff</literal> extension in the usual way,
     1.5  	by adding a line to the <literal
     1.6  	  role="rc-extensions">extensions</literal> section of your
     1.7 -	<filename role="special"> /.hgrc</filename>.</para>
     1.8 -      <programlisting>[extensions] extdiff =</programlisting>
     1.9 +	<filename role="special">~/.hgrc</filename>.</para>
    1.10 +      <programlisting>[extensions]
    1.11 +extdiff =</programlisting>
    1.12        <para>The <command>interdiff</command> command expects to be
    1.13  	passed the names of two files, but the <literal
    1.14  	  role="hg-ext">extdiff</literal> extension passes the program
    1.15 @@ -477,22 +478,20 @@
    1.16        <para>With the <filename role="special">hg-interdiff</filename>
    1.17  	program in your shell's search path, you can run it as
    1.18  	follows, from inside an MQ patch directory:</para>
    1.19 -      <programlisting>hg extdiff -p hg-interdiff -r A:B
    1.20 -	my-change.patch</programlisting>
    1.21 +      <programlisting>hg extdiff -p hg-interdiff -r A:B my-change.patch</programlisting>
    1.22        <para>Since you'll probably want to use this long-winded command
    1.23  	a lot, you can get <literal role="hg-ext">hgext</literal> to
    1.24  	make it available as a normal Mercurial command, again by
    1.25 -	editing your <filename role="special">
    1.26 -	  /.hgrc</filename>.</para>
    1.27 -      <programlisting>[extdiff] cmd.interdiff =
    1.28 -	hg-interdiff</programlisting>
    1.29 +	editing your <filename
    1.30 +	  role="special">~/.hgrc</filename>.</para>
    1.31 +      <programlisting>[extdiff]
    1.32 +cmd.interdiff = hg-interdiff</programlisting>
    1.33        <para>This directs <literal role="hg-ext">hgext</literal> to
    1.34  	make an <literal>interdiff</literal> command available, so you
    1.35  	can now shorten the previous invocation of <command
    1.36  	  role="hg-ext-extdiff">extdiff</command> to something a
    1.37  	little more wieldy.</para>
    1.38 -      <programlisting>hg interdiff -r A:B
    1.39 -	my-change.patch</programlisting>
    1.40 +      <programlisting>hg interdiff -r A:B my-change.patch</programlisting>
    1.41  
    1.42        <note>
    1.43  	<para>  The <command>interdiff</command> command works well