Mercurial > hgbook
comparison en/ch03-tour-merge.xml @ 746:d0160b0b1a9e
Merge with http://hg.serpentine.com/mercurial/book
| author | Dongsheng Song <dongsheng.song@gmail.com> |
|---|---|
| date | Wed, 18 Mar 2009 20:32:37 +0800 |
| parents | a13813534ccd 80928ea6e7ae |
| children |
comparison
equal
deleted
inserted
replaced
| 745:c2cefd9f9893 | 746:d0160b0b1a9e |
|---|---|
| 342 <title>Simplifying the pull-merge-commit sequence</title> | 342 <title>Simplifying the pull-merge-commit sequence</title> |
| 343 | 343 |
| 344 <para>The process of merging changes as outlined above is | 344 <para>The process of merging changes as outlined above is |
| 345 straightforward, but requires running three commands in | 345 straightforward, but requires running three commands in |
| 346 sequence.</para> | 346 sequence.</para> |
| 347 <programlisting> | 347 <programlisting>hg pull |
| 348 hg pull hg merge hg commit -m 'Merged remote changes' | 348 hg merge |
| 349 </programlisting> | 349 hg commit -m 'Merged remote changes'</programlisting> |
| 350 <para>In the case of the final commit, you also need to enter a | 350 <para>In the case of the final commit, you also need to enter a |
| 351 commit message, which is almost always going to be a piece of | 351 commit message, which is almost always going to be a piece of |
| 352 uninteresting <quote>boilerplate</quote> text.</para> | 352 uninteresting <quote>boilerplate</quote> text.</para> |
| 353 | 353 |
| 354 <para>It would be nice to reduce the number of steps needed, if | 354 <para>It would be nice to reduce the number of steps needed, if |
| 381 role="special">.hgrc</filename>, and either go to the <literal | 381 role="special">.hgrc</filename>, and either go to the <literal |
| 382 role="rc-extensions">extensions</literal> section or create an | 382 role="rc-extensions">extensions</literal> section or create an |
| 383 <literal role="rc-extensions">extensions</literal> section. Then | 383 <literal role="rc-extensions">extensions</literal> section. Then |
| 384 add a line that simply reads <quote><literal>fetch | 384 add a line that simply reads <quote><literal>fetch |
| 385 </literal></quote>.</para> | 385 </literal></quote>.</para> |
| 386 <programlisting> | 386 <programlisting>[extensions] |
| 387 [extensions] fetch = | 387 fetch =</programlisting> |
| 388 </programlisting> | |
| 389 <para>(Normally, on the right-hand side of the | 388 <para>(Normally, on the right-hand side of the |
| 390 <quote><literal>=</literal></quote> would appear the location of | 389 <quote><literal>=</literal></quote> would appear the location of |
| 391 the extension, but since the <literal | 390 the extension, but since the <literal |
| 392 role="hg-ext">fetch</literal> extension is in the standard | 391 role="hg-ext">fetch</literal> extension is in the standard |
| 393 distribution, Mercurial knows where to search for it.)</para> | 392 distribution, Mercurial knows where to search for it.)</para> |