[Monotone-commits-diffs] net.venge.monotone: 495e346cbb78df42c94b72c95bf62174b32e84cf

[code]

revision:            495e346cbb78df42c94b72c95bf62174b32e84cf
date:                2012-06-28T10:26:24
author:              address@hidden
branch:              net.venge.monotone
changelog:
* test/func/using_packets/__driver__.lua, doc/monotone.texi (Using packets): 
modified test to produce same file_ids, rev_ids as bash commands in example 
(forgot newlines)

manifest:
format_version "1"

new_manifest [0b5378f4baec19c45b77c4bde51bcd4165e7e292]

old_revision [2df669cf5444b56ddafda3f22581c920607a938c]

patch "doc/monotone.texi"
 from [ebe81dfcdba71897e9e5841f05005e7a69ee4702]
   to [41082cc1abba4942eb22374a13ad30fbe5042a67]

patch "test/func/using_packets/__driver__.lua"
 from [81b274b427a5b932c6c965dc0ce82ea31f22885c]
   to [d8e8f5be387ba1b658b5eb128515f4261608fb34]
============================================================
--- doc/monotone.texi	ebe81dfcdba71897e9e5841f05005e7a69ee4702
+++ doc/monotone.texi	41082cc1abba4942eb22374a13ad30fbe5042a67
@@ -4429,9 +4429,9 @@ @section Using packets
 @group
 $ cd ..
 $ mtn -d A automate select i: | mtn -d A automate toposort address@hidden
-2d0b9a10f73ce2445213506c2a0a81b8e910b923
-b2ae639e410e4970cab274a580e87d08adc87ee7
-299b021a6d426f2ff3b09fabcd165abe5d82f2b5
+a423db0ad651c74e41ab2529eca6f17513ccf714
+d14e89582ad9030e1eb62f563c8721be02ca0b65
+151f1fb125f19ebe11eb8bfe3a5798fcbea4e736
 @end group
 @end smallexample
 
@@ -4440,17 +4440,17 @@ @section Using packets
 
 @smallexample
 @group
-$ mtn -d A automate get_revision 2d0b9a10f73ce2445213506c2a0a81b8e910b923
+$ mtn -d A automate get_revision a423db0ad651c74e41ab2529eca6f17513ccf714
 format_version "1"
 
-new_manifest [e93adafbcdcafc2fccc1188de73d0d96f8dd2818]
+new_manifest [b6dbdbbe0e7f41e44d9b72f9fe29b1f1a4f47f18]
 
 old_revision []
 
 add_dir ""
 
 add_file "file"
- content [66b27417d37e024c46526c2f6d358a754fc552f3]
+ content [8714e0ef31edb00e33683f575274379955b3526c]
 @end group
 @end smallexample
 
@@ -4471,34 +4471,34 @@ @section Using packets
 @smallexample
 @group
 mtn -d A pubkey johndoe@@domain.com > KEY_PACKETS
-mtn -d A automate packet_for_fdata 66b27417d37e024c46526c2f6d358a754fc552f3 > PACKETS
-mtn -d A automate packet_for_rdata 2d0b9a10f73ce2445213506c2a0a81b8e910b923 >> PACKETS
-mtn -d A automate packets_for_certs 2d0b9a10f73ce2445213506c2a0a81b8e910b923 >> PACKETS
+mtn -d A automate packet_for_fdata 8714e0ef31edb00e33683f575274379955b3526c > PACKETS
+mtn -d A automate packet_for_rdata a423db0ad651c74e41ab2529eca6f17513ccf714 >> PACKETS
+mtn -d A automate packets_for_certs a423db0ad651c74e41ab2529eca6f17513ccf714 >> PACKETS
 mtn -d B read KEY_PACKETS PACKETS
 @end group
 @end smallexample
 
 Database B now contains revision
-2d0b9a10f73ce2445213506c2a0a81b8e910b923. You may want to check the
+a423db0ad651c74e41ab2529eca6f17513ccf714. You may want to check the
 PACKETS file to see what the packets look like.
 
 Now let's transfer one more revision:
 
 @smallexample
 @group
-mtn -d A automate get_revision b2ae639e410e4970cab274a580e87d08adc87ee7
+mtn -d A automate get_revision d14e89582ad9030e1eb62f563c8721be02ca0b65
 format_version "1"
 
-new_manifest [a13f0659778955abbe84f5676d328382ca71008f]
+new_manifest [48a03530005d46ed9c31c8f83ad96c4fa22b8b28]
 
-old_revision [2d0b9a10f73ce2445213506c2a0a81b8e910b923]
+old_revision [a423db0ad651c74e41ab2529eca6f17513ccf714]
 
 add_file "file2"
- content [ca085d538b534aa2f1746ac9a61c6f1d279356a4]
+ content [d2178687226560032947c1deacb39d16a16ea5c6]
 
 patch "file"
- from [66b27417d37e024c46526c2f6d358a754fc552f3]
-   to [491cd4818acc21cb6fb3f8fd5676633d60a6b973]
+ from [8714e0ef31edb00e33683f575274379955b3526c]
+   to [8b52d96d4fab6c1e56d6364b0a2673f4111b228e]
 @end group
 @end smallexample
 
@@ -4507,11 +4507,11 @@ @section Using packets
 
 @smallexample
 @group
-mtn -d A automate packet_for_fdata ca085d538b534aa2f1746ac9a61c6f1d279356a4 > PACKETS2
+mtn -d A automate packet_for_fdata d2178687226560032947c1deacb39d16a16ea5c6 > PACKETS2
 mtn -d A automate packet_for_fdelta
-66b27417d37e024c46526c2f6d358a754fc552f3 491cd4818acc21cb6fb3f8fd5676633d60a6b973 >> PACKETS2
-mtn -d A automate packet_for_rdata b2ae639e410e4970cab274a580e87d08adc87ee7 >> PACKETS2
-mtn -d A automate packets_for_certs b2ae639e410e4970cab274a580e87d08adc87ee7 >> PACKETS2
+8714e0ef31edb00e33683f575274379955b3526c 8b52d96d4fab6c1e56d6364b0a2673f4111b228e >> PACKETS2
+mtn -d A automate packet_for_rdata d14e89582ad9030e1eb62f563c8721be02ca0b65 >> PACKETS2
+mtn -d A automate packets_for_certs d14e89582ad9030e1eb62f563c8721be02ca0b65 >> PACKETS2
 mtn -d B read < PACKETS2
 @end group
 @end smallexample
@@ -4522,13 +4522,13 @@ @section Using packets
 @smallexample
 @group
 $ mtn -d A automate select i: | mtn -d A automate toposort address@hidden
-2d0b9a10f73ce2445213506c2a0a81b8e910b923
-b2ae639e410e4970cab274a580e87d08adc87ee7
-299b021a6d426f2ff3b09fabcd165abe5d82f2b5
+a423db0ad651c74e41ab2529eca6f17513ccf714
+d14e89582ad9030e1eb62f563c8721be02ca0b65
+151f1fb125f19ebe11eb8bfe3a5798fcbea4e736
 
 $ mtn -d B automate select i: | mtn -d B automate toposort address@hidden
-2d0b9a10f73ce2445213506c2a0a81b8e910b923
-b2ae639e410e4970cab274a580e87d08adc87ee7
+a423db0ad651c74e41ab2529eca6f17513ccf714
+d14e89582ad9030e1eb62f563c8721be02ca0b65
 @end group
 @end smallexample
 
@@ -4549,7 +4549,6 @@ @section Using packets
 
 And that's it! The revisions were successfully transferred.
 
-
 @page
 @node    Bisecting,  , Using packets, Advanced Uses
 @section Bisecting
============================================================
--- test/func/using_packets/__driver__.lua	81b274b427a5b932c6c965dc0ce82ea31f22885c
+++ test/func/using_packets/__driver__.lua	d8e8f5be387ba1b658b5eb128515f4261608fb34
@@ -27,18 +27,18 @@ check(mtnA("setup", "--branch=test", "."
 
 -- add revisions to A
 
-writefile("file", "xyz")
+writefile("file", "xyz\n")
 check(mtnA("add", "file"), 0, nil, false)
 check(mtnA("commit", "-m", "One"), 0, nil, false)
 rev_one = base_revision()
 
-writefile("file2", "file 2 getting in")
-writefile("file", "ERASE")
+writefile("file2", "file 2 getting in\n")
+writefile("file", "ERASE\n")
 check(mtnA("add", "file2"), 0, nil, false)
 check(mtnA("commit", "-m", "Two"), 0, nil, false)
 rev_two = base_revision()
 
-writefile("file", "THIRD")
+writefile("file", "THIRD\n")
 check(mtnA("commit", "-m", "Three"), 0, nil, false)
 rev_three = base_revision()
 
@@ -48,13 +48,13 @@ check(samelines("stdout",
 check(samelines("stdout", {rev_three, rev_one, rev_two}))
 -- show the rev ids, so we can copy them into monotone.texi
 check(samelines("stdout",
-{"299b021a6d426f2ff3b09fabcd165abe5d82f2b5", -- rev_three
- "2d0b9a10f73ce2445213506c2a0a81b8e910b923", -- rev_one
- "b2ae639e410e4970cab274a580e87d08adc87ee7"})) -- rev_two
+{"151f1fb125f19ebe11eb8bfe3a5798fcbea4e736", -- rev_three
+ "a423db0ad651c74e41ab2529eca6f17513ccf714", -- rev_one
+ "d14e89582ad9030e1eb62f563c8721be02ca0b65"})) -- rev_two
 
 -- Transfer rev_one to db B
 -- first, get the file id
-file_id_one = "66b27417d37e024c46526c2f6d358a754fc552f3"
+file_id_one = "8714e0ef31edb00e33683f575274379955b3526c"
 check(mtnA("automate", "get_revision", rev_one), 0, true, nil)
 check(qgrep(file_id_one, "stdout"))
 
@@ -76,8 +76,8 @@ check(mtnB("read", "KEY_PACKETS", "PACKE
 check(mtnB("read", "KEY_PACKETS", "PACKET1", "PACKET2", "PACKET3"), 0, nil, false)
 
 -- Now transfer rev_two
-file_id_two = "491cd4818acc21cb6fb3f8fd5676633d60a6b973"
-file2_id_two = "ca085d538b534aa2f1746ac9a61c6f1d279356a4"
+file_id_two = "8b52d96d4fab6c1e56d6364b0a2673f4111b228e"
+file2_id_two = "d2178687226560032947c1deacb39d16a16ea5c6"
 check(mtnA("automate", "get_revision", rev_two), 0, true, nil)
 check(qgrep(file_id_two, "stdout"))
 check(qgrep(file2_id_two, "stdout"))