Mercurial > hgbook
comparison en/ch03-concepts.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 | 2ff0a43f1152 1c13ed2130a7 |
comparison
equal
deleted
inserted
replaced
| 692:8dfdbe1cf982 | 693:0b45854f0b7b |
|---|---|
| 51 | 51 |
| 52 <figure id="fig:concepts:filelog"> | 52 <figure id="fig:concepts:filelog"> |
| 53 <title>Relationships between files in working directory and | 53 <title>Relationships between files in working directory and |
| 54 filelogs in repository</title> | 54 filelogs in repository</title> |
| 55 <mediaobject> | 55 <mediaobject> |
| 56 <imageobject><imagedata fileref="filelog"/></imageobject> | 56 <imageobject><imagedata fileref="figs/filelog.png"/></imageobject> |
| 57 <textobject><phrase>XXX add text</phrase></textobject> | 57 <textobject><phrase>XXX add text</phrase></textobject> |
| 58 </mediaobject> | 58 </mediaobject> |
| 59 </figure> | 59 </figure> |
| 60 | 60 |
| 61 </sect2> | 61 </sect2> |
| 100 <xref linkend="fig:concepts:metadata"/>.</para> | 100 <xref linkend="fig:concepts:metadata"/>.</para> |
| 101 | 101 |
| 102 <figure id="fig:concepts:metadata"> | 102 <figure id="fig:concepts:metadata"> |
| 103 <title>Metadata relationships</title> | 103 <title>Metadata relationships</title> |
| 104 <mediaobject> | 104 <mediaobject> |
| 105 <imageobject><imagedata fileref="metadata"/></imageobject> | 105 <imageobject><imagedata fileref="figs/metadata.png"/></imageobject> |
| 106 <textobject><phrase>XXX add text</phrase></textobject> | 106 <textobject><phrase>XXX add text</phrase></textobject> |
| 107 </mediaobject> | 107 </mediaobject> |
| 108 </figure> | 108 </figure> |
| 109 | 109 |
| 110 <para id="x_2f3">As the illustration shows, there is | 110 <para id="x_2f3">As the illustration shows, there is |
| 185 longer it takes to reconstruct a particular revision.</para> | 185 longer it takes to reconstruct a particular revision.</para> |
| 186 | 186 |
| 187 <figure id="fig:concepts:snapshot"> | 187 <figure id="fig:concepts:snapshot"> |
| 188 <title>Snapshot of a revlog, with incremental deltas</title> | 188 <title>Snapshot of a revlog, with incremental deltas</title> |
| 189 <mediaobject> | 189 <mediaobject> |
| 190 <imageobject><imagedata fileref="snapshot"/></imageobject> | 190 <imageobject><imagedata fileref="figs/snapshot.png"/></imageobject> |
| 191 <textobject><phrase>XXX add text</phrase></textobject> | 191 <textobject><phrase>XXX add text</phrase></textobject> |
| 192 </mediaobject> | 192 </mediaobject> |
| 193 </figure> | 193 </figure> |
| 194 | 194 |
| 195 <para id="x_2fc">The innovation that Mercurial applies to this problem is | 195 <para id="x_2fc">The innovation that Mercurial applies to this problem is |
| 289 revision IDs in its parent slots.</para> | 289 revision IDs in its parent slots.</para> |
| 290 | 290 |
| 291 <figure id="fig:concepts:revlog"> | 291 <figure id="fig:concepts:revlog"> |
| 292 <title>The conceptual structure of a revlog</title> | 292 <title>The conceptual structure of a revlog</title> |
| 293 <mediaobject> | 293 <mediaobject> |
| 294 <imageobject><imagedata fileref="revlog"/></imageobject> | 294 <imageobject><imagedata fileref="figs/revlog.png"/></imageobject> |
| 295 <textobject><phrase>XXX add text</phrase></textobject> | 295 <textobject><phrase>XXX add text</phrase></textobject> |
| 296 </mediaobject> | 296 </mediaobject> |
| 297 </figure> | 297 </figure> |
| 298 | 298 |
| 299 </sect1> | 299 </sect1> |
| 340 changeset</emphasis> when you perform a commit.</para> | 340 changeset</emphasis> when you perform a commit.</para> |
| 341 | 341 |
| 342 <figure id="fig:concepts:wdir"> | 342 <figure id="fig:concepts:wdir"> |
| 343 <title>The working directory can have two parents</title> | 343 <title>The working directory can have two parents</title> |
| 344 <mediaobject> | 344 <mediaobject> |
| 345 <imageobject><imagedata fileref="wdir"/></imageobject> | 345 <imageobject><imagedata fileref="figs/wdir.png"/></imageobject> |
| 346 <textobject><phrase>XXX add text</phrase></textobject> | 346 <textobject><phrase>XXX add text</phrase></textobject> |
| 347 </mediaobject> | 347 </mediaobject> |
| 348 </figure> | 348 </figure> |
| 349 | 349 |
| 350 <para id="x_30d"><xref linkend="fig:concepts:wdir"/> shows the | 350 <para id="x_30d"><xref linkend="fig:concepts:wdir"/> shows the |
| 355 | 355 |
| 356 <figure id="fig:concepts:wdir-after-commit"> | 356 <figure id="fig:concepts:wdir-after-commit"> |
| 357 <title>The working directory gains new parents after a | 357 <title>The working directory gains new parents after a |
| 358 commit</title> | 358 commit</title> |
| 359 <mediaobject> | 359 <mediaobject> |
| 360 <imageobject><imagedata fileref="wdir-after-commit"/></imageobject> | 360 <imageobject><imagedata fileref="figs/wdir-after-commit.png"/></imageobject> |
| 361 <textobject><phrase>XXX add text</phrase></textobject> | 361 <textobject><phrase>XXX add text</phrase></textobject> |
| 362 </mediaobject> | 362 </mediaobject> |
| 363 </figure> | 363 </figure> |
| 364 | 364 |
| 365 <para id="x_30f">It's useful to think of the working directory as | 365 <para id="x_30f">It's useful to think of the working directory as |
| 396 | 396 |
| 397 <figure id="fig:concepts:wdir-pre-branch"> | 397 <figure id="fig:concepts:wdir-pre-branch"> |
| 398 <title>The working directory, updated to an older | 398 <title>The working directory, updated to an older |
| 399 changeset</title> | 399 changeset</title> |
| 400 <mediaobject> | 400 <mediaobject> |
| 401 <imageobject><imagedata fileref="wdir-pre-branch"/></imageobject> | 401 <imageobject><imagedata fileref="figs/wdir-pre-branch.png"/></imageobject> |
| 402 <textobject><phrase>XXX add text</phrase></textobject> | 402 <textobject><phrase>XXX add text</phrase></textobject> |
| 403 </mediaobject> | 403 </mediaobject> |
| 404 </figure> | 404 </figure> |
| 405 | 405 |
| 406 <para id="x_313">Having updated the working directory to an | 406 <para id="x_313">Having updated the working directory to an |
| 416 | 416 |
| 417 <figure id="fig:concepts:wdir-branch"> | 417 <figure id="fig:concepts:wdir-branch"> |
| 418 <title>After a commit made while synced to an older | 418 <title>After a commit made while synced to an older |
| 419 changeset</title> | 419 changeset</title> |
| 420 <mediaobject> | 420 <mediaobject> |
| 421 <imageobject><imagedata fileref="wdir-branch"/></imageobject> | 421 <imageobject><imagedata fileref="figs/wdir-branch.png"/></imageobject> |
| 422 <textobject><phrase>XXX add text</phrase></textobject> | 422 <textobject><phrase>XXX add text</phrase></textobject> |
| 423 </mediaobject> | 423 </mediaobject> |
| 424 </figure> | 424 </figure> |
| 425 | 425 |
| 426 <note> | 426 <note> |
| 458 | 458 |
| 459 <figure id="fig:concepts:wdir-merge"> | 459 <figure id="fig:concepts:wdir-merge"> |
| 460 <title>Merging two heads</title> | 460 <title>Merging two heads</title> |
| 461 <mediaobject> | 461 <mediaobject> |
| 462 <imageobject> | 462 <imageobject> |
| 463 <imagedata fileref="wdir-merge"/> | 463 <imagedata fileref="figs/wdir-merge.png"/> |
| 464 </imageobject> | 464 </imageobject> |
| 465 <textobject><phrase>XXX add text</phrase></textobject> | 465 <textobject><phrase>XXX add text</phrase></textobject> |
| 466 </mediaobject> | 466 </mediaobject> |
| 467 </figure> | 467 </figure> |
| 468 | 468 |