# HG changeset patch # User Dongsheng Song # Date 1236844718 -28800 # Node ID 0e3d8f66bbb7a17e1fa2c3d920c92ab101591b79 # Parent 8271c8891b0e3d2bf4de992385a754be1f15a452 Rename en/figs to en/images diff -r 8271c8891b0e -r 0e3d8f66bbb7 Makefile --- a/Makefile Thu Mar 12 15:53:01 2009 +0800 +++ b/Makefile Thu Mar 12 15:58:38 2009 +0800 @@ -140,12 +140,12 @@ else html: build/$(LINGUA)/html/index.html -build/$(LINGUA)/html/index.html: build/$(LINGUA)/source/hgbook.xml stylesheets/html.xsl stylesheets/$(LINGUA)/html.xsl +build/$(LINGUA)/html/index.html: build/$(LINGUA)/source/hgbook.xml xsl/html.xsl xsl/$(LINGUA)/html.xsl mkdir -p build/$(LINGUA)/html/images cp en/images/*.png build/$(LINGUA)/html/images - cp stylesheets/hgbook.css build/$(LINGUA)/html + cp web/styles.css build/$(LINGUA)/html/hgbook.css xsltproc --output build/$(LINGUA)/html/ \ - stylesheets/$(LINGUA)/html.xsl build/$(LINGUA)/source/hgbook.xml + xsl/$(LINGUA)/html.xsl build/$(LINGUA)/source/hgbook.xml endif ifndef LINGUA @@ -156,12 +156,12 @@ else html-single: build/$(LINGUA)/html-single/hgbook.html -build/$(LINGUA)/html-single/hgbook.html: build/$(LINGUA)/source/hgbook.xml stylesheets/html-single.xsl stylesheets/$(LINGUA)/html-single.xsl +build/$(LINGUA)/html-single/hgbook.html: build/$(LINGUA)/source/hgbook.xml xsl/html-single.xsl xsl/$(LINGUA)/html-single.xsl mkdir -p build/$(LINGUA)/html-single/images cp en/images/*.png build/$(LINGUA)/html-single/images - cp stylesheets/hgbook.css build/$(LINGUA)/html-single + cp web/styles.css build/$(LINGUA)/html-single/hgbook.css xsltproc --output build/$(LINGUA)/html-single/hgbook.html \ - stylesheets/$(LINGUA)/html-single.xsl build/$(LINGUA)/source/hgbook.xml + xsl/$(LINGUA)/html-single.xsl build/$(LINGUA)/source/hgbook.xml endif ifndef LINGUA @@ -172,7 +172,7 @@ else pdf: build/$(LINGUA)/pdf/hgbook.pdf -build/$(LINGUA)/pdf/hgbook.pdf: build/$(LINGUA)/source/hgbook.xml stylesheets/fo.xsl stylesheets/$(LINGUA)/fo.xsl +build/$(LINGUA)/pdf/hgbook.pdf: build/$(LINGUA)/source/hgbook.xml xsl/fo.xsl xsl/$(LINGUA)/fo.xsl mkdir -p build/$(LINGUA)/pdf java -classpath tools/fop/lib/saxon65.jar:tools/fop/lib/saxon65-dbxsl.jar:tools/fop/lib/xml-commons-resolver-1.2.jar:tools/fop/conf \ com.icl.saxon.StyleSheet \ @@ -181,7 +181,7 @@ -r org.apache.xml.resolver.tools.CatalogResolver \ -o build/$(LINGUA)/source/hgbook.fo \ build/$(LINGUA)/source/hgbook.xml \ - stylesheets/$(LINGUA)/fo.xsl \ + xsl/$(LINGUA)/fo.xsl \ fop1.extensions=1 (cd build/$(LINGUA)/source && ../../../tools/fop/fop.sh hgbook.fo ../pdf/hgbook.pdf) diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/figs/feature-branches.dot --- a/en/figs/feature-branches.dot Thu Mar 12 15:53:01 2009 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -digraph feature_branches { - master -> crypto; - master -> filesystems; - master -> ipc; - master -> memory; - master -> network; - master -> security; -} diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/figs/filelog.svg --- a/en/figs/filelog.svg Thu Mar 12 15:53:01 2009 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,373 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - .hg/store/data/README.i - - - - - README - - - - - - - - - .hg/store/data/src/hello.c.d - .hg/store/data/src/hello.c.i - - - - - src/hello.c - - - - Working directory - Repository - - diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/figs/kdiff3.png Binary file en/figs/kdiff3.png has changed diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/figs/metadata.svg --- a/en/figs/metadata.svg Thu Mar 12 15:53:01 2009 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,328 +0,0 @@ - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Changelog - Manifest - Filelogs - - diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/figs/mq-stack.svg --- a/en/figs/mq-stack.svg Thu Mar 12 15:53:01 2009 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,270 +0,0 @@ - - - - - - - - - image/svg+xml - - - - - - - prevent-compiler-reorder.patch - - namespace-cleanup.patch - - powerpc-port-fixes.patch - - report-devinfo-correctly.patch - { - { - present in series,but not applied - patches applied,changesets present - topmostapplied patch - 201ad3209902 - 126b84e593ae - a655daf15409 - e50d59aaea3a - - forbid-illegal-params.patch - - fix-memory-leak.patch - - diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/figs/note.png Binary file en/figs/note.png has changed diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/figs/revlog.svg --- a/en/figs/revlog.svg Thu Mar 12 15:53:01 2009 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1155 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - Second parent - 32bf9a5f22c0 - - - - Revision hash - 34b8b7a15ea1 - - - - ... - Revision data (delta or snapshot) - - - - - - - First parent - 000000000000 - - - - Second parent - 000000000000 - - - - - Revision hash - ff9dc8bc2a8b - - - - ... - Revision data (delta or snapshot) - - - - - - - First parent - 34b8b7a15ea1 - - - - Second parent - 000000000000 - - - - Revision hash - 1b67dc96f27a - - - - ... - Revision data (delta or snapshot) - - - - - - - - First parent - ff9dc8bc2a8b - - - - Second parent - 000000000000 - - - - Revision hash - 5b80c922ebdd - - - - ... - Revision data (delta or snapshot) - - - - - - - First parent - ecacb6b4c9fd - - - - Second parent - 000000000000 - - - - Revision hash - 32bf9a5f22c0 - - - - ... - Revision data (delta or snapshot) - - - - - - First parent - ff9dc8bc2a8b - - - - Second parent - 000000000000 - - - - Revision hash - ecacb6b4c9fd - - - - ... - Revision data (delta or snapshot) - - - - - - - Head revision(no children) - Merge revision(two parents) - Branches(two revisions,same parent) - - - First revision(both parents null) - - First parent - 5b80c922ebdd - - - - - diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/figs/snapshot.svg --- a/en/figs/snapshot.svg Thu Mar 12 15:53:01 2009 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,202 +0,0 @@ - - - - - - - - - image/svg+xml - - - - - - - - - - Index, rev 7 - - Revlog index (.i file) - Revlog data (.d file) - - - Snapshot, rev 4 - - Delta, rev 4 to 5 - - Delta, rev 5 to 6 - - Delta, rev 6 to 7 - - Delta, rev 2 to 3 - - diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/figs/tour-history.svg --- a/en/figs/tour-history.svg Thu Mar 12 15:53:01 2009 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,289 +0,0 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - 0: REV0 - - 1: REV1 - - 2: REV2 - - 3: REV3 - - 4: REV4 - - - - - - (newest) - (oldest) - - 4: REV4 - - - revisionnumber - changesetidentifier - - diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/figs/tour-merge-conflict.svg --- a/en/figs/tour-merge-conflict.svg Thu Mar 12 15:53:01 2009 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,210 +0,0 @@ - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - Greetings!I am Mariam Abacha, the wife of former Nigerian dictator Sani Abacha. I am contacting you in confidence, and as a means of developing - - - - - - Greetings!I am Shehu Musa Abacha, cousin to the former Nigerian dictator Sani Abacha. I am contacting you in confidence, and as a means of developing - - - - - - Greetings!I am Alhaji Abba Abacha, son of the former Nigerian dictator Sani Abacha. I am contacting you in confidence, and as a means of developing - - - Base version - Our changes - Their changes - - diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/figs/tour-merge-merge.svg --- a/en/figs/tour-merge-merge.svg Thu Mar 12 15:53:01 2009 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,380 +0,0 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - 4: REV4 - - - 5: REV_my_new_hello - - - 6: REV6_my_new_hello - - tip (and head) - head - - - - merge - working directoryduring merge - - 4: REV4 - - - 5: REV_my_new_hello - - - 6: REV6_my_new_hello - - tip - - - 7: REV7_my_new_hello - Working directory during merge - Repository after merge committed - - diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/figs/tour-merge-pull.svg --- a/en/figs/tour-merge-pull.svg Thu Mar 12 15:53:01 2009 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,288 +0,0 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - 0: REV0 - - 1: REV1 - - 2: REV2 - - 3: REV3 - - 4: REV4 - - - - - - 5: REV_my_new_hello - - - 6: REV6_my_new_hello - - tip (and head) - head - - diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/figs/tour-merge-sep-repos.svg --- a/en/figs/tour-merge-sep-repos.svg Thu Mar 12 15:53:01 2009 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,466 +0,0 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - 0: REV0 - - 1: REV1 - - 2: REV2 - - 3: REV3 - - 4: REV4 - - - - - - 5: REV_my_hello - - my-hello - - 0: REV0 - - 1: REV1 - - 2: REV2 - - 3: REV3 - - 4: REV4 - - - - - - 5: REV_my_new_hello - - my-new-hello - newest changesdiffer - common history - - - - - - - head revision(has no children) - - diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/figs/undo-manual-merge.dot --- a/en/figs/undo-manual-merge.dot Thu Mar 12 15:53:01 2009 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -digraph undo_manual { - "first change" -> "second change"; - "second change" -> "third change"; - backout [label="back out\nsecond change", shape=box]; - "second change" -> backout; - "third change" -> "manual\nmerge"; - backout -> "manual\nmerge"; -} diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/figs/undo-manual.dot --- a/en/figs/undo-manual.dot Thu Mar 12 15:53:01 2009 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -digraph undo_manual { - "first change" -> "second change"; - "second change" -> "third change"; - backout [label="back out\nsecond change", shape=box]; - "second change" -> backout; -} diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/figs/undo-non-tip.dot --- a/en/figs/undo-non-tip.dot Thu Mar 12 15:53:01 2009 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -digraph undo_non_tip { - "first change" -> "second change"; - "second change" -> "third change"; - backout [label="back out\nsecond change", shape=box]; - "second change" -> backout; - merge [label="automated\nmerge", shape=box]; - "third change" -> merge; - backout -> merge; -} diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/figs/undo-simple.dot --- a/en/figs/undo-simple.dot Thu Mar 12 15:53:01 2009 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -digraph undo_simple { - "first change" -> "second change"; - "second change" -> "back out\nsecond change"; -} diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/figs/wdir-after-commit.svg --- a/en/figs/wdir-after-commit.svg Thu Mar 12 15:53:01 2009 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,394 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - dfbbb33f3fa3 - - - e7639888bb2f - - 7b064d8bac5e - - - - 000000000000 - - History in repository - - - - dfbbb33f3fa3 - - - - 000000000000 - - First parent - Second parent - Parents of working directory - - - Newchangeset - - diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/figs/wdir-branch.svg --- a/en/figs/wdir-branch.svg Thu Mar 12 15:53:01 2009 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,418 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - e7639888bb2f - - - - 7b064d8bac5e - - - - 000000000000 - - - - - ffb20e1701ea - - - - 000000000000 - - First parent - Second parent - Parents of working directory - - - - - ffb20e1701ea - - - Pre-existing head - Newly created head (and tip) - - - - diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/figs/wdir-merge.svg --- a/en/figs/wdir-merge.svg Thu Mar 12 15:53:01 2009 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,425 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - 7b064d8bac5e - - - - 000000000000 - - - - - ffb20e1701ea - - - - e7639888bb2f - - First parent (unchanged) - Second parent - Parents of working directory - - - - - ffb20e1701ea - - - Pre-existing head - Newly created head (and tip) - - - - - - e7639888bb2f - - - diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/figs/wdir-pre-branch.svg --- a/en/figs/wdir-pre-branch.svg Thu Mar 12 15:53:01 2009 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,364 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - e7639888bb2f - - - 7b064d8bac5e - - - - 000000000000 - - History in repository - - - - 7b064d8bac5e - - - - 000000000000 - - First parent - Second parent - Parents of working directory - - - - diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/figs/wdir.svg --- a/en/figs/wdir.svg Thu Mar 12 15:53:01 2009 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,348 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - e7639888bb2f - - 7b064d8bac5e - - - 000000000000 - - - History in repository - - - - - e7639888bb2f - - - - 000000000000 - - First parent - Second parent - - Parents of working directory - - - - diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/images/feature-branches.dot --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/images/feature-branches.dot Thu Mar 12 15:58:38 2009 +0800 @@ -0,0 +1,8 @@ +digraph feature_branches { + master -> crypto; + master -> filesystems; + master -> ipc; + master -> memory; + master -> network; + master -> security; +} diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/images/filelog.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/images/filelog.svg Thu Mar 12 15:58:38 2009 +0800 @@ -0,0 +1,373 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + .hg/store/data/README.i + + + + + README + + + + + + + + + .hg/store/data/src/hello.c.d + .hg/store/data/src/hello.c.i + + + + + src/hello.c + + + + Working directory + Repository + + diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/images/kdiff3.png Binary file en/images/kdiff3.png has changed diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/images/metadata.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/images/metadata.svg Thu Mar 12 15:58:38 2009 +0800 @@ -0,0 +1,328 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Changelog + Manifest + Filelogs + + diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/images/mq-stack.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/images/mq-stack.svg Thu Mar 12 15:58:38 2009 +0800 @@ -0,0 +1,270 @@ + + + + + + + + + image/svg+xml + + + + + + + prevent-compiler-reorder.patch + + namespace-cleanup.patch + + powerpc-port-fixes.patch + + report-devinfo-correctly.patch + { + { + present in series,but not applied + patches applied,changesets present + topmostapplied patch + 201ad3209902 + 126b84e593ae + a655daf15409 + e50d59aaea3a + + forbid-illegal-params.patch + + fix-memory-leak.patch + + diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/images/note.png Binary file en/images/note.png has changed diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/images/revlog.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/images/revlog.svg Thu Mar 12 15:58:38 2009 +0800 @@ -0,0 +1,1155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + Second parent + 32bf9a5f22c0 + + + + Revision hash + 34b8b7a15ea1 + + + + ... + Revision data (delta or snapshot) + + + + + + + First parent + 000000000000 + + + + Second parent + 000000000000 + + + + + Revision hash + ff9dc8bc2a8b + + + + ... + Revision data (delta or snapshot) + + + + + + + First parent + 34b8b7a15ea1 + + + + Second parent + 000000000000 + + + + Revision hash + 1b67dc96f27a + + + + ... + Revision data (delta or snapshot) + + + + + + + + First parent + ff9dc8bc2a8b + + + + Second parent + 000000000000 + + + + Revision hash + 5b80c922ebdd + + + + ... + Revision data (delta or snapshot) + + + + + + + First parent + ecacb6b4c9fd + + + + Second parent + 000000000000 + + + + Revision hash + 32bf9a5f22c0 + + + + ... + Revision data (delta or snapshot) + + + + + + First parent + ff9dc8bc2a8b + + + + Second parent + 000000000000 + + + + Revision hash + ecacb6b4c9fd + + + + ... + Revision data (delta or snapshot) + + + + + + + Head revision(no children) + Merge revision(two parents) + Branches(two revisions,same parent) + + + First revision(both parents null) + + First parent + 5b80c922ebdd + + + + + diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/images/snapshot.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/images/snapshot.svg Thu Mar 12 15:58:38 2009 +0800 @@ -0,0 +1,202 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + Index, rev 7 + + Revlog index (.i file) + Revlog data (.d file) + + + Snapshot, rev 4 + + Delta, rev 4 to 5 + + Delta, rev 5 to 6 + + Delta, rev 6 to 7 + + Delta, rev 2 to 3 + + diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/images/tour-history.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/images/tour-history.svg Thu Mar 12 15:58:38 2009 +0800 @@ -0,0 +1,289 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + 0: REV0 + + 1: REV1 + + 2: REV2 + + 3: REV3 + + 4: REV4 + + + + + + (newest) + (oldest) + + 4: REV4 + + + revisionnumber + changesetidentifier + + diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/images/tour-merge-conflict.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/images/tour-merge-conflict.svg Thu Mar 12 15:58:38 2009 +0800 @@ -0,0 +1,210 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + Greetings!I am Mariam Abacha, the wife of former Nigerian dictator Sani Abacha. I am contacting you in confidence, and as a means of developing + + + + + + Greetings!I am Shehu Musa Abacha, cousin to the former Nigerian dictator Sani Abacha. I am contacting you in confidence, and as a means of developing + + + + + + Greetings!I am Alhaji Abba Abacha, son of the former Nigerian dictator Sani Abacha. I am contacting you in confidence, and as a means of developing + + + Base version + Our changes + Their changes + + diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/images/tour-merge-merge.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/images/tour-merge-merge.svg Thu Mar 12 15:58:38 2009 +0800 @@ -0,0 +1,380 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + 4: REV4 + + + 5: REV_my_new_hello + + + 6: REV6_my_new_hello + + tip (and head) + head + + + + merge + working directoryduring merge + + 4: REV4 + + + 5: REV_my_new_hello + + + 6: REV6_my_new_hello + + tip + + + 7: REV7_my_new_hello + Working directory during merge + Repository after merge committed + + diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/images/tour-merge-pull.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/images/tour-merge-pull.svg Thu Mar 12 15:58:38 2009 +0800 @@ -0,0 +1,288 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + 0: REV0 + + 1: REV1 + + 2: REV2 + + 3: REV3 + + 4: REV4 + + + + + + 5: REV_my_new_hello + + + 6: REV6_my_new_hello + + tip (and head) + head + + diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/images/tour-merge-sep-repos.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/images/tour-merge-sep-repos.svg Thu Mar 12 15:58:38 2009 +0800 @@ -0,0 +1,466 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + 0: REV0 + + 1: REV1 + + 2: REV2 + + 3: REV3 + + 4: REV4 + + + + + + 5: REV_my_hello + + my-hello + + 0: REV0 + + 1: REV1 + + 2: REV2 + + 3: REV3 + + 4: REV4 + + + + + + 5: REV_my_new_hello + + my-new-hello + newest changesdiffer + common history + + + + + + + head revision(has no children) + + diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/images/undo-manual-merge.dot --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/images/undo-manual-merge.dot Thu Mar 12 15:58:38 2009 +0800 @@ -0,0 +1,8 @@ +digraph undo_manual { + "first change" -> "second change"; + "second change" -> "third change"; + backout [label="back out\nsecond change", shape=box]; + "second change" -> backout; + "third change" -> "manual\nmerge"; + backout -> "manual\nmerge"; +} diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/images/undo-manual.dot --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/images/undo-manual.dot Thu Mar 12 15:58:38 2009 +0800 @@ -0,0 +1,6 @@ +digraph undo_manual { + "first change" -> "second change"; + "second change" -> "third change"; + backout [label="back out\nsecond change", shape=box]; + "second change" -> backout; +} diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/images/undo-non-tip.dot --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/images/undo-non-tip.dot Thu Mar 12 15:58:38 2009 +0800 @@ -0,0 +1,9 @@ +digraph undo_non_tip { + "first change" -> "second change"; + "second change" -> "third change"; + backout [label="back out\nsecond change", shape=box]; + "second change" -> backout; + merge [label="automated\nmerge", shape=box]; + "third change" -> merge; + backout -> merge; +} diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/images/undo-simple.dot --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/images/undo-simple.dot Thu Mar 12 15:58:38 2009 +0800 @@ -0,0 +1,4 @@ +digraph undo_simple { + "first change" -> "second change"; + "second change" -> "back out\nsecond change"; +} diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/images/wdir-after-commit.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/images/wdir-after-commit.svg Thu Mar 12 15:58:38 2009 +0800 @@ -0,0 +1,394 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + dfbbb33f3fa3 + + + e7639888bb2f + + 7b064d8bac5e + + + + 000000000000 + + History in repository + + + + dfbbb33f3fa3 + + + + 000000000000 + + First parent + Second parent + Parents of working directory + + + Newchangeset + + diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/images/wdir-branch.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/images/wdir-branch.svg Thu Mar 12 15:58:38 2009 +0800 @@ -0,0 +1,418 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + e7639888bb2f + + + + 7b064d8bac5e + + + + 000000000000 + + + + + ffb20e1701ea + + + + 000000000000 + + First parent + Second parent + Parents of working directory + + + + + ffb20e1701ea + + + Pre-existing head + Newly created head (and tip) + + + + diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/images/wdir-merge.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/images/wdir-merge.svg Thu Mar 12 15:58:38 2009 +0800 @@ -0,0 +1,425 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + 7b064d8bac5e + + + + 000000000000 + + + + + ffb20e1701ea + + + + e7639888bb2f + + First parent (unchanged) + Second parent + Parents of working directory + + + + + ffb20e1701ea + + + Pre-existing head + Newly created head (and tip) + + + + + + e7639888bb2f + + + diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/images/wdir-pre-branch.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/images/wdir-pre-branch.svg Thu Mar 12 15:58:38 2009 +0800 @@ -0,0 +1,364 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + e7639888bb2f + + + 7b064d8bac5e + + + + 000000000000 + + History in repository + + + + 7b064d8bac5e + + + + 000000000000 + + First parent + Second parent + Parents of working directory + + + + diff -r 8271c8891b0e -r 0e3d8f66bbb7 en/images/wdir.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/images/wdir.svg Thu Mar 12 15:58:38 2009 +0800 @@ -0,0 +1,348 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + e7639888bb2f + + 7b064d8bac5e + + + 000000000000 + + + History in repository + + + + + e7639888bb2f + + + + 000000000000 + + First parent + Second parent + + Parents of working directory + + + +