# HG changeset patch # User Yoshiki Yazawa # Date 1245323527 -32400 # Node ID ce4050cf7d44090982c8ccfee794ed17c0842d0d # Parent 1a30d2627512f9aabdbd9a412ccb1eda29f9df09 copy figs diff -r 1a30d2627512 -r ce4050cf7d44 ja/figs/feature-branches.dot --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ja/figs/feature-branches.dot Thu Jun 18 20:12:07 2009 +0900 @@ -0,0 +1,8 @@ +digraph feature_branches { + master -> crypto; + master -> filesystems; + master -> ipc; + master -> memory; + master -> network; + master -> security; +} diff -r 1a30d2627512 -r ce4050cf7d44 ja/figs/filelog.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ja/figs/filelog.svg Thu Jun 18 20:12:07 2009 +0900 @@ -0,0 +1,381 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + .hg/store/data/_r_e_a_d_m_e.i + + + + + README + + + + + + + + + .hg/store/data/src/hello.c.d + .hg/store/data/src/hello.c.i + + + + + src/hello.c + + + + Working directory + Repository + + diff -r 1a30d2627512 -r ce4050cf7d44 ja/figs/kdiff3.png Binary file ja/figs/kdiff3.png has changed diff -r 1a30d2627512 -r ce4050cf7d44 ja/figs/metadata.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ja/figs/metadata.svg Thu Jun 18 20:12:07 2009 +0900 @@ -0,0 +1,328 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Changelog + Manifest + Filelogs + + diff -r 1a30d2627512 -r ce4050cf7d44 ja/figs/mq-stack.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ja/figs/mq-stack.svg Thu Jun 18 20:12:07 2009 +0900 @@ -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 1a30d2627512 -r ce4050cf7d44 ja/figs/note.png Binary file ja/figs/note.png has changed diff -r 1a30d2627512 -r ce4050cf7d44 ja/figs/revlog.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ja/figs/revlog.svg Thu Jun 18 20:12:07 2009 +0900 @@ -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 1a30d2627512 -r ce4050cf7d44 ja/figs/snapshot.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ja/figs/snapshot.svg Thu Jun 18 20:12:07 2009 +0900 @@ -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 1a30d2627512 -r ce4050cf7d44 ja/figs/throbber.gif Binary file ja/figs/throbber.gif has changed diff -r 1a30d2627512 -r ce4050cf7d44 ja/figs/tip.png Binary file ja/figs/tip.png has changed diff -r 1a30d2627512 -r ce4050cf7d44 ja/figs/tour-history.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ja/figs/tour-history.svg Thu Jun 18 20:12:07 2009 +0900 @@ -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 1a30d2627512 -r ce4050cf7d44 ja/figs/tour-merge-conflict.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ja/figs/tour-merge-conflict.svg Thu Jun 18 20:12:07 2009 +0900 @@ -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 1a30d2627512 -r ce4050cf7d44 ja/figs/tour-merge-merge.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ja/figs/tour-merge-merge.svg Thu Jun 18 20:12:07 2009 +0900 @@ -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 1a30d2627512 -r ce4050cf7d44 ja/figs/tour-merge-pull.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ja/figs/tour-merge-pull.svg Thu Jun 18 20:12:07 2009 +0900 @@ -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 1a30d2627512 -r ce4050cf7d44 ja/figs/tour-merge-sep-repos.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ja/figs/tour-merge-sep-repos.svg Thu Jun 18 20:12:07 2009 +0900 @@ -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 1a30d2627512 -r ce4050cf7d44 ja/figs/undo-manual-merge.dot --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ja/figs/undo-manual-merge.dot Thu Jun 18 20:12:07 2009 +0900 @@ -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 1a30d2627512 -r ce4050cf7d44 ja/figs/undo-manual.dot --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ja/figs/undo-manual.dot Thu Jun 18 20:12:07 2009 +0900 @@ -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 1a30d2627512 -r ce4050cf7d44 ja/figs/undo-non-tip.dot --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ja/figs/undo-non-tip.dot Thu Jun 18 20:12:07 2009 +0900 @@ -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 1a30d2627512 -r ce4050cf7d44 ja/figs/undo-simple.dot --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ja/figs/undo-simple.dot Thu Jun 18 20:12:07 2009 +0900 @@ -0,0 +1,4 @@ +digraph undo_simple { + "first change" -> "second change"; + "second change" -> "back out\nsecond change"; +} diff -r 1a30d2627512 -r ce4050cf7d44 ja/figs/warning.png Binary file ja/figs/warning.png has changed diff -r 1a30d2627512 -r ce4050cf7d44 ja/figs/wdir-after-commit.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ja/figs/wdir-after-commit.svg Thu Jun 18 20:12:07 2009 +0900 @@ -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 1a30d2627512 -r ce4050cf7d44 ja/figs/wdir-branch.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ja/figs/wdir-branch.svg Thu Jun 18 20:12:07 2009 +0900 @@ -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 1a30d2627512 -r ce4050cf7d44 ja/figs/wdir-merge.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ja/figs/wdir-merge.svg Thu Jun 18 20:12:07 2009 +0900 @@ -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 1a30d2627512 -r ce4050cf7d44 ja/figs/wdir-pre-branch.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ja/figs/wdir-pre-branch.svg Thu Jun 18 20:12:07 2009 +0900 @@ -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 1a30d2627512 -r ce4050cf7d44 ja/figs/wdir.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ja/figs/wdir.svg Thu Jun 18 20:12:07 2009 +0900 @@ -0,0 +1,348 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + e7639888bb2f + + 7b064d8bac5e + + + 000000000000 + + + History in repository + + + + + e7639888bb2f + + + + 000000000000 + + First parent + Second parent + + Parents of working directory + + + +