Mercurial > hgbook
comparison en/ch08-undo.xml @ 693:0b45854f0b7b
Generate and include images properly.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Thu, 26 Mar 2009 22:00:53 -0700 |
| parents | 4ce9d0754af3 |
| children | 1c13ed2130a7 |
comparison
equal
deleted
inserted
replaced
| 692:8dfdbe1cf982 | 693:0b45854f0b7b |
|---|---|
| 359 | 359 |
| 360 <figure id="fig:undo:backout"> | 360 <figure id="fig:undo:backout"> |
| 361 <title>Backing out a change using the <command | 361 <title>Backing out a change using the <command |
| 362 role="hg-cmd">hg backout</command> command</title> | 362 role="hg-cmd">hg backout</command> command</title> |
| 363 <mediaobject> | 363 <mediaobject> |
| 364 <imageobject><imagedata fileref="undo-simple"/></imageobject> | 364 <imageobject><imagedata fileref="figs/undo-simple.png"/></imageobject> |
| 365 <textobject><phrase>XXX add text</phrase></textobject> | 365 <textobject><phrase>XXX add text</phrase></textobject> |
| 366 </mediaobject> | 366 </mediaobject> |
| 367 </figure> | 367 </figure> |
| 368 | 368 |
| 369 </sect2> | 369 </sect2> |
| 406 | 406 |
| 407 <figure id="fig:undo:backout-non-tip"> | 407 <figure id="fig:undo:backout-non-tip"> |
| 408 <title>Automated backout of a non-tip change using the | 408 <title>Automated backout of a non-tip change using the |
| 409 <command role="hg-cmd">hg backout</command> command</title> | 409 <command role="hg-cmd">hg backout</command> command</title> |
| 410 <mediaobject> | 410 <mediaobject> |
| 411 <imageobject><imagedata fileref="undo-non-tip"/></imageobject> | 411 <imageobject><imagedata fileref="figs/undo-non-tip.png"/></imageobject> |
| 412 <textobject><phrase>XXX add text</phrase></textobject> | 412 <textobject><phrase>XXX add text</phrase></textobject> |
| 413 </mediaobject> | 413 </mediaobject> |
| 414 </figure> | 414 </figure> |
| 415 | 415 |
| 416 <para id="x_103">The result is that you end up <quote>back where you | 416 <para id="x_103">The result is that you end up <quote>back where you |
| 471 | 471 |
| 472 <figure id="fig:undo:backout-manual"> | 472 <figure id="fig:undo:backout-manual"> |
| 473 <title>Backing out a change using the <command | 473 <title>Backing out a change using the <command |
| 474 role="hg-cmd">hg backout</command> command</title> | 474 role="hg-cmd">hg backout</command> command</title> |
| 475 <mediaobject> | 475 <mediaobject> |
| 476 <imageobject><imagedata fileref="undo-manual"/></imageobject> | 476 <imageobject><imagedata fileref="figs/undo-manual.png"/></imageobject> |
| 477 <textobject><phrase>XXX add text</phrase></textobject> | 477 <textobject><phrase>XXX add text</phrase></textobject> |
| 478 </mediaobject> | 478 </mediaobject> |
| 479 </figure> | 479 </figure> |
| 480 | 480 |
| 481 <para id="x_10a">After the <command role="hg-cmd">hg backout</command> | 481 <para id="x_10a">After the <command role="hg-cmd">hg backout</command> |
| 509 <xref linkend="fig:undo:backout-manual-merge"/>.</para> | 509 <xref linkend="fig:undo:backout-manual-merge"/>.</para> |
| 510 | 510 |
| 511 <figure id="fig:undo:backout-manual-merge"> | 511 <figure id="fig:undo:backout-manual-merge"> |
| 512 <title>Manually merging a backout change</title> | 512 <title>Manually merging a backout change</title> |
| 513 <mediaobject> | 513 <mediaobject> |
| 514 <imageobject><imagedata fileref="undo-manual-merge"/></imageobject> | 514 <imageobject><imagedata fileref="figs/undo-manual-merge.png"/></imageobject> |
| 515 <textobject><phrase>XXX add text</phrase></textobject> | 515 <textobject><phrase>XXX add text</phrase></textobject> |
| 516 </mediaobject> | 516 </mediaobject> |
| 517 </figure> | 517 </figure> |
| 518 | 518 |
| 519 </sect2> | 519 </sect2> |