#
#
# patch "revision.cc"
#  from [2b5ffb27164f7265cba31f3ffe0dee42ad1773d4]
#    to [a6177c38eb55e9f6f136c2f1fef11ecf82508f35]
# 
# patch "tests/automate_get_content_changed/expected"
#  from [dbbab9f01c659035286bfcd0a65b464ff7716490]
#    to [cf43b38e1a67b4504e6dcdb58ce7d4ee506896ec]
# 
# patch "tests/automate_get_revision/expected"
#  from [dae0d8e3f944c82a9688bcd6af99f5b837b41968]
#    to [4931e24a476eff2a71e980d273cdc56d8833f7a3]
# 
# patch "tests/automate_inventory_options/expected-no-ignored.stdout"
#  from [8d87531d633398ec074c79a1196ab3fe3461437c]
#    to [bcc2f6399cd8ef1573fad326a5760d1a81660188]
# 
# patch "tests/automate_inventory_options/expected-no-unchanged.stdout"
#  from [098d4e5d46fd9f072d9fe4b5ce57fa297806b09c]
#    to [1481dc07265f7ce973784d7e0f58825eada6420a]
# 
# patch "tests/automate_inventory_options/expected-no-unknown.stdout"
#  from [6f89120110a15a4979689a11d984037858245f60]
#    to [6b099ac5fe45332cfbd0868990063019d2c7a88c]
# 
# patch "tests/automate_inventory_options/expected-none.stdout"
#  from [8b56b8744aa7c03ece83e8f947a989b7afa66ed1]
#    to [fb312fe947aeb9b10879836d538b9afcb8acdbe3]
# 
# patch "tests/automate_inventory_options/expected-renames-both.stdout"
#  from [30c148e193838a02d0e041f8befc0c7d6b29c646]
#    to [5c012bbe880615463ce8689743c8e5daf20f2a8e]
# 
# patch "tests/automate_inventory_options/expected-renames-target-no-ignored.stdout"
#  from [208a14ecc012d3880e47db2af06eef124f83ce1c]
#    to [418e9670aa2157318f596ca5707d11d98cfbc0ef]
# 
# patch "tests/automate_inventory_options/expected-renames-target-no-unknown.stdout"
#  from [ae4773015e235754db26b51ceab35cf5944e7a5e]
#    to [4d77f171df768e11d7ed5e87c835af3b8ee16bb7]
# 
# patch "tests/automate_inventory_options/expected-renames-target.stdout"
#  from [fc960c1c87ed1111a6dd8dee9a5e9423aaf28c78]
#    to [de61abbc96f1431a8361e40a178bd6cb82f84539]
# 
# patch "tests/automate_put_revision/__driver__.lua"
#  from [deeeb9cb4ff8625284a4f69846ef9fa561a42ccf]
#    to [396d9c53d34b4341e9a9ca98e5ea36ead269b4d8]
# 
# patch "tests/automate_show_conflicts/expected-attribute-attached.stdout"
#  from [4ceb87a115b7810e89c6b39cf6564f3d64f4cc61]
#    to [698b1ba6aaf59e81d64b5fe280ac192dfc7df088]
# 
# patch "tests/automate_show_conflicts/expected-attribute-detached.stdout"
#  from [40c709752502f9976b78f252e7bf7346e879255c]
#    to [1f43caaa3ce4f9d271cff1d026b279ec17f27852]
# 
# patch "tests/automate_show_conflicts/expected-content-attached.stdout"
#  from [6c39a0131b22693f4086fb68970e827a3241a287]
#    to [7af6116b9dd5ff67c8aa327a2d4f576385e10fcc]
# 
# patch "tests/automate_show_conflicts/expected-content-detached.stdout"
#  from [fb8495a17d8f6a59572cb87703c7f05af418b65d]
#    to [b21ee9506b57fe1f45ef693a717e48df4de2d88a]
# 
# patch "tests/automate_show_conflicts/expected-directory-loop.stdout"
#  from [de5f4fbfee1d8fdafde73535041ddde66207eb2a]
#    to [3e7ce2152aebbfaded2d13e96a91c4be68e9e204]
# 
# patch "tests/automate_show_conflicts/expected-duplicate-add-rename.stdout"
#  from [960c1810ffd09fb5fb6e7623dd5740c623d2e46a]
#    to [43b965b51e1ca0992c4ef67ed49d39aa522805f5]
# 
# patch "tests/automate_show_conflicts/expected-duplicate-adds.stdout"
#  from [f62b2ef38c303a56d63f23849907a5e9a4c0af8c]
#    to [2483c221f8e64f1e16e898a325b4fc470d654ca9]
# 
# patch "tests/automate_show_conflicts/expected-duplicate-name-multiple-name-missing-root.stdout"
#  from [97246345a094fdb4d824196a148ff03f163372fd]
#    to [61c40a5b51e5c47e6d46601a1d87a1361349812f]
# 
# patch "tests/automate_show_conflicts/expected-duplicate-renames.stdout"
#  from [fcefa7860a93fb5a21ea56045a22c1d7085702eb]
#    to [e8559ce823b3bc1000946c5b5ca977595acf93dc]
# 
# patch "tests/automate_show_conflicts/expected-invalid-add.stdout"
#  from [979bcb70f07c8c1bd1257abaac3ccc838685df16]
#    to [a98c53730bee539877d9884a5e6945080d0f0b1c]
# 
# patch "tests/automate_show_conflicts/expected-invalid-rename.stdout"
#  from [03f20ce606834c98052f061d9db45e98199e69e5]
#    to [6933cc55f5559463645b9dd6e9b33f918f16feda]
# 
# patch "tests/automate_show_conflicts/expected-missing-root.stdout"
#  from [94b47debd3848a1369db6c4c45123448f34f5766]
#    to [d6c6ff5112a437c06ef38aa05227d6d8832488a8]
# 
# patch "tests/automate_show_conflicts/expected-multiple-name-plus-directory-loop.stdout"
#  from [fb19db164690da0bfacc3023861bfbde3e0a6756]
#    to [888489c3c464c01581aedf3e1c655e0c1e0ed33d]
# 
# patch "tests/automate_show_conflicts/expected-multiple-name-plus-duplicate-name.stdout"
#  from [9fd3b1c4abfcf81218e7f1114cb110e9bdf63ab5]
#    to [aaf38f9f033c67c44f2b48cd0d5078247c161dc3]
# 
# patch "tests/automate_show_conflicts/expected-multiple-name-plus-orphan.stdout"
#  from [11b1c86e6b665778c54def56ed4b25d9d2c672c2]
#    to [8869c7e2fe4c6a21a354c14a4e3875f9cbf69999]
# 
# patch "tests/automate_show_conflicts/expected-multiple-names.stdout"
#  from [9cdc729aed940d5504888465e20bb4ca30f8d5ba]
#    to [56726a3e28c21f4e0cf58a55d56c08ad0e68fcd6]
# 
# patch "tests/automate_show_conflicts/expected-orphaned-add.stdout"
#  from [a935d1c389fa30701f15e2c01cd880ee3a1c8620]
#    to [43a043caab61ec1a522918e8076dbf05f5cd13ee]
# 
# patch "tests/automate_show_conflicts/expected-orphaned-rename.stdout"
#  from [6096fa729c8ef741b7a64a7405984f601906c5bb]
#    to [5c77ca680005b4094bcb18f635b93827da48bab0]
# 
# patch "tests/automate_show_conflicts/expected-unrelated-projects.stdout"
#  from [ee0741479e34ee1343e029dec1e206ca171716b4]
#    to [f0006a8503d9e919ac25d80711c96d4bd966bd15]
# 
# patch "tests/db_rosterify_preserves_renames/expout"
#  from [879f84c3e8b6c3486afcc1ff58295d38984b9862]
#    to [bcd740b2f5519a893c5a6ade53a46e303499cecd]
# 
# patch "tests/diff_against_empty_file/expected.diff"
#  from [4bd7f5ef4ef0e7ef33ee6995cb9b37e14385c918]
#    to [1d9cfccf0f4b14458a9dc95ed163aedd41fcb9f7]
# 
# patch "tests/diff_on_missing_trailing_newline_at_end_of_file/file13.diff"
#  from [d6e7ac58324be3537427f865e5925f187331f5de]
#    to [e0510e6649983da53251c3331ba205fe5fcb2ec6]
# 
# patch "tests/diff_on_missing_trailing_newline_at_end_of_file/file14.diff"
#  from [dcdd2294fa92ad013ddc177c12f3a3bed0c2dd38]
#    to [3bd09e03e483fb149dde741e056670e4cf9a8a40]
# 
# patch "tests/diff_on_missing_trailing_newline_at_end_of_file/file23.diff"
#  from [86af946a84931611d6625fe4b555ab42b4e8fc0d]
#    to [0a6f095a2610813a341f9de3a269c0a2f8bedf5a]
# 
# patch "tests/diff_on_missing_trailing_newline_at_end_of_file/file24.diff"
#  from [e6c588f9eac350fac803802708a65f2807b68673]
#    to [b11710b5185e8ddc5a0ee1019e7f0fc778db344f]
# 
# patch "tests/exchanging_work_via_netsync,_with_notes/testnotes.test"
#  from [7a9f14e9a6567c37da8eadd1e23f383bb5632072]
#    to [de6bd24f0872552159110be808cdb8c6d6d76639]
# 
# patch "tests/importing_cvs_tricky_repo_with_tags/test.tags"
#  from [3dc70bde8e7a37132a0b98638a32be4494477832]
#    to [0907dd3e5bcfe22929186989060e21f8604a163f]
# 
# patch "tests/merge_into_workspace/__driver__.lua"
#  from [eff4b2a9a9871f5086b302176397d983e6590c54]
#    to [09a11a18dfe2e40b8ecfbd610883ac6db35eca36]
# 
# patch "tests/merge_into_workspace/expected-log"
#  from [77915a878636ca16ee32f5385d88a7dc8bd0054a]
#    to [4587aba962a1e7fce1ab7939f2f29a5b28358645]
# 
# patch "tests/merge_into_workspace/expected-log-left"
#  from [6f396f4e143f0b58ef18131c13549622eea39cfb]
#    to [e8469bbb7f572a5f010e2fe68d767de318d8ac33]
# 
# patch "tests/merge_into_workspace_attr_corpse/expected-roster"
#  from [ec6ec9f4baf4b624a31910544eada0aaae4ff5e2]
#    to [449189ed40b89ff5992c371781a375efa5bd5514]
# 
# patch "tests/merge_into_workspace_files_added/expected-revision"
#  from [8c8848dd89bc0626bb099b7d1128fc93cdb5d78e]
#    to [54ce771fef19632232dd85c005ed49e1053d37d0]
# 
# patch "tests/merge_multiple_heads_1/__driver__.lua"
#  from [bebbc7168575bafba8c3ef75f2e4a1f564b5d80a]
#    to [24578fdabe586f3691c3a24483c31c65bd65ac73]
# 
# patch "tests/merge_update_part_of_file/before.diff"
#  from [1f6b25391440c416b57b517d8ce552d7b7a52f80]
#    to [3baa9f63ec6c1a6be93c39fb5c2f8e661fe745e8]
# 
# patch "tests/merge_with_conflicting_name_and_renamed_dir/expected.stdout"
#  from [2e696c102e7388389e5117fd0cba1e736bef7ee3]
#    to [0ef8a2df21240536b648ae7ee4bf79b3b2248d60]
# 
# patch "tests/rosterify_on_a_db_with_an_empty_manifest/revision_good"
#  from [8b182249d66c7d6e0c8a04eb5de1227cdece8a1e]
#    to [f44f1bfe87e1cafb55c4fcca675a03d80d221cee]
#
============================================================
--- revision.cc	2b5ffb27164f7265cba31f3ffe0dee42ad1773d4
+++ revision.cc	a6177c38eb55e9f6f136c2f1fef11ecf82508f35
@@ -68,7 +68,7 @@ using boost::shared_ptr;
 //
 // If a new revision basic_io format is not strictly a superset of a
 // previous one, we'll need to support migration for this.
-static const unsigned int current_revision_format = 1;
+static const unsigned int current_revision_format = 2;
 
 void revision_t::check_sane() const
 {
============================================================
--- tests/automate_get_content_changed/expected	dbbab9f01c659035286bfcd0a65b464ff7716490
+++ tests/automate_get_content_changed/expected	cf43b38e1a67b4504e6dcdb58ce7d4ee506896ec
@@ -1 +1 @@
-content_mark [dae0d8e3f944c82a9688bcd6af99f5b837b41968]
+content_mark [4931e24a476eff2a71e980d273cdc56d8833f7a3]
============================================================
--- tests/automate_get_revision/expected	dae0d8e3f944c82a9688bcd6af99f5b837b41968
+++ tests/automate_get_revision/expected	4931e24a476eff2a71e980d273cdc56d8833f7a3
@@ -1,4 +1,4 @@
-format_version "1"
+format_version "2"
 
 new_manifest [407ad1469e65feae6dcecc268e129d9369b69675]
 
============================================================
--- tests/automate_inventory_options/expected-no-ignored.stdout	8d87531d633398ec074c79a1196ab3fe3461437c
+++ tests/automate_inventory_options/expected-no-ignored.stdout	bcc2f6399cd8ef1573fad326a5760d1a81660188
@@ -1,8 +1,8 @@ new_type "directory"
     path "source"
 old_type "directory"
 new_type "directory"
  fs_type "directory"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "known"
 
     path "source/added"
@@ -20,7 +20,7 @@ new_type "file"
 old_type "file"
 new_type "file"
  fs_type "none"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "missing"
 
     path "source/rename_source"
@@ -33,21 +33,21 @@ old_path "source/rename_source"
 new_type "file"
 old_path "source/rename_source"
  fs_type "file"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "rename_target" "known"
 
     path "source/source_1"
 old_type "file"
 new_type "file"
  fs_type "file"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "known"
 
     path "source/source_2"
 old_type "file"
 new_type "file"
  fs_type "file"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "known"
  changes "content"
 
============================================================
--- tests/automate_inventory_options/expected-no-unchanged.stdout	098d4e5d46fd9f072d9fe4b5ce57fa297806b09c
+++ tests/automate_inventory_options/expected-no-unchanged.stdout	1481dc07265f7ce973784d7e0f58825eada6420a
@@ -17,7 +17,7 @@ new_type "file"
 old_type "file"
 new_type "file"
  fs_type "none"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "missing"
 
     path "source/rename_source"
@@ -30,14 +30,14 @@ old_path "source/rename_source"
 new_type "file"
 old_path "source/rename_source"
  fs_type "file"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "rename_target" "known"
 
     path "source/source_2"
 old_type "file"
 new_type "file"
  fs_type "file"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "known"
  changes "content"
 
============================================================
--- tests/automate_inventory_options/expected-no-unknown.stdout	6f89120110a15a4979689a11d984037858245f60
+++ tests/automate_inventory_options/expected-no-unknown.stdout	6b099ac5fe45332cfbd0868990063019d2c7a88c
@@ -1,8 +1,8 @@ new_type "directory"
     path "source"
 old_type "directory"
 new_type "directory"
  fs_type "directory"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "known"
 
     path "source/added"
@@ -24,7 +24,7 @@ new_type "file"
 old_type "file"
 new_type "file"
  fs_type "none"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "missing"
 
     path "source/rename_source"
@@ -37,20 +37,20 @@ old_path "source/rename_source"
 new_type "file"
 old_path "source/rename_source"
  fs_type "file"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "rename_target" "known"
 
     path "source/source_1"
 old_type "file"
 new_type "file"
  fs_type "file"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "known"
 
     path "source/source_2"
 old_type "file"
 new_type "file"
  fs_type "file"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "known"
  changes "content"
============================================================
--- tests/automate_inventory_options/expected-none.stdout	8b56b8744aa7c03ece83e8f947a989b7afa66ed1
+++ tests/automate_inventory_options/expected-none.stdout	fb312fe947aeb9b10879836d538b9afcb8acdbe3
@@ -1,8 +1,8 @@ new_type "directory"
     path "source"
 old_type "directory"
 new_type "directory"
  fs_type "directory"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "known"
 
     path "source/added"
@@ -24,7 +24,7 @@ new_type "file"
 old_type "file"
 new_type "file"
  fs_type "none"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "missing"
 
     path "source/rename_source"
@@ -37,21 +37,21 @@ old_path "source/rename_source"
 new_type "file"
 old_path "source/rename_source"
  fs_type "file"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "rename_target" "known"
 
     path "source/source_1"
 old_type "file"
 new_type "file"
  fs_type "file"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "known"
 
     path "source/source_2"
 old_type "file"
 new_type "file"
  fs_type "file"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "known"
  changes "content"
 
============================================================
--- tests/automate_inventory_options/expected-renames-both.stdout	30c148e193838a02d0e041f8befc0c7d6b29c646
+++ tests/automate_inventory_options/expected-renames-both.stdout	5c012bbe880615463ce8689743c8e5daf20f2a8e
@@ -37,7 +37,7 @@ old_path "source"
 new_type "directory"
 old_path "source"
  fs_type "directory"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "rename_target" "known"
 
     path "target/added"
@@ -54,28 +54,28 @@ old_path "source/missing"
 new_type "file"
 old_path "source/missing"
  fs_type "none"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "rename_target" "missing"
 
     path "target/rename_target"
 new_type "file"
 old_path "source/rename_source"
  fs_type "file"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "rename_target" "known"
 
     path "target/source_1"
 new_type "file"
 old_path "source/source_1"
  fs_type "file"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "rename_target" "known"
 
     path "target/source_2"
 new_type "file"
 old_path "source/source_2"
  fs_type "file"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "rename_target" "known"
  changes "content"
 
============================================================
--- tests/automate_inventory_options/expected-renames-target-no-ignored.stdout	208a14ecc012d3880e47db2af06eef124f83ce1c
+++ tests/automate_inventory_options/expected-renames-target-no-ignored.stdout	418e9670aa2157318f596ca5707d11d98cfbc0ef
@@ -1,8 +1,8 @@ old_path "source"
     path "target"
 new_type "directory"
 old_path "source"
  fs_type "directory"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "rename_target" "known"
 
     path "target/added"
@@ -15,28 +15,28 @@ old_path "source/missing"
 new_type "file"
 old_path "source/missing"
  fs_type "none"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "rename_target" "missing"
 
     path "target/rename_target"
 new_type "file"
 old_path "source/rename_source"
  fs_type "file"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "rename_target" "known"
 
     path "target/source_1"
 new_type "file"
 old_path "source/source_1"
  fs_type "file"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "rename_target" "known"
 
     path "target/source_2"
 new_type "file"
 old_path "source/source_2"
  fs_type "file"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "rename_target" "known"
  changes "content"
 
============================================================
--- tests/automate_inventory_options/expected-renames-target-no-unknown.stdout	ae4773015e235754db26b51ceab35cf5944e7a5e
+++ tests/automate_inventory_options/expected-renames-target-no-unknown.stdout	4d77f171df768e11d7ed5e87c835af3b8ee16bb7
@@ -1,8 +1,8 @@ old_path "source"
     path "target"
 new_type "directory"
 old_path "source"
  fs_type "directory"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "rename_target" "known"
 
     path "target/added"
@@ -19,27 +19,27 @@ old_path "source/missing"
 new_type "file"
 old_path "source/missing"
  fs_type "none"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "rename_target" "missing"
 
     path "target/rename_target"
 new_type "file"
 old_path "source/rename_source"
  fs_type "file"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "rename_target" "known"
 
     path "target/source_1"
 new_type "file"
 old_path "source/source_1"
  fs_type "file"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "rename_target" "known"
 
     path "target/source_2"
 new_type "file"
 old_path "source/source_2"
  fs_type "file"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "rename_target" "known"
  changes "content"
============================================================
--- tests/automate_inventory_options/expected-renames-target.stdout	fc960c1c87ed1111a6dd8dee9a5e9423aaf28c78
+++ tests/automate_inventory_options/expected-renames-target.stdout	de61abbc96f1431a8361e40a178bd6cb82f84539
@@ -1,8 +1,8 @@ old_path "source"
     path "target"
 new_type "directory"
 old_path "source"
  fs_type "directory"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "rename_target" "known"
 
     path "target/added"
@@ -19,28 +19,28 @@ old_path "source/missing"
 new_type "file"
 old_path "source/missing"
  fs_type "none"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "rename_target" "missing"
 
     path "target/rename_target"
 new_type "file"
 old_path "source/rename_source"
  fs_type "file"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "rename_target" "known"
 
     path "target/source_1"
 new_type "file"
 old_path "source/source_1"
  fs_type "file"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "rename_target" "known"
 
     path "target/source_2"
 new_type "file"
 old_path "source/source_2"
  fs_type "file"
-   birth [cb271687054afd3c2b873c8994f206f08fb240d3]
+   birth [9453d17be20e9fe09f32d1cdb94372f538b9a69f]
   status "rename_target" "known"
  changes "content"
 
============================================================
--- tests/automate_put_revision/__driver__.lua	deeeb9cb4ff8625284a4f69846ef9fa561a42ccf
+++ tests/automate_put_revision/__driver__.lua	396d9c53d34b4341e9a9ca98e5ea36ead269b4d8
@@ -1,6 +1,6 @@ mtn_setup()
 mtn_setup()
 
-rev = "format_version \"1\"\n\nnew_manifest [0000000000000000000000000000000000000004]\n\nold_revision []\n\nadd_dir \"\"\n\nadd_file \"foo\"\n content [5bf1fd927dfb8679496a2e6cf00cbe50c1c87145]\n"
+rev = "format_version \"2\"\n\nnew_manifest [0000000000000000000000000000000000000004]\n\nold_revision []\n\nadd_dir \"\"\n\nadd_file \"foo\"\n content [5bf1fd927dfb8679496a2e6cf00cbe50c1c87145]\n"
 
 check(mtn("automate", "put_file", "blah"), 0, true, false)
 canonicalize("stdout")
@@ -10,28 +10,28 @@ canonicalize("stdout")
 
 check(mtn("automate", "put_revision", rev), 0, true, false)
 canonicalize("stdout")
-rev = "4c2c1d846fa561601254200918fba1fd71e6795d"
+old_rev = "e12272e25a690ee6c23b2e1b80d7f67866aacaef"
 result = readfile("stdout")
-check(result == rev.."\n")
+check(result == old_rev.."\n")
 
-check(mtn("automate", "cert", rev, "author", "address@hidden"), 0, true, false)
-check(mtn("automate", "cert", rev, "branch", "testbranch"), 0, true, false)
-check(mtn("automate", "cert", rev, "changelog", "blah-blah"), 0, true, false)
-check(mtn("automate", "cert", rev, "date", "2005-05-21T12:30:51"), 0, true, false)
+check(mtn("automate", "cert", old_rev, "author", "address@hidden"), 0, true, false)
+check(mtn("automate", "cert", old_rev, "branch", "testbranch"), 0, true, false)
+check(mtn("automate", "cert", old_rev, "changelog", "blah-blah"), 0, true, false)
+check(mtn("automate", "cert", old_rev, "date", "2005-05-21T12:30:51"), 0, true, false)
 
 check(mtn("automate", "heads", "testbranch"), 0, true, false)
 canonicalize("stdout")
-check(rev.."\n" == readfile("stdout"))
+check(old_rev.."\n" == readfile("stdout"))
 
 --
 -- this should trigger an invariant
 -- I'm trying to re-add a file which already exists
 --
-rev = "format_version \"1\"\n\nnew_manifest [0000000000000000000000000000000000000000]\n\nold_revision [4c2c1d846fa561601254200918fba1fd71e6795d]\n\nadd_file \"foo\"\n content [5bf1fd927dfb8679496a2e6cf00cbe50c1c87145]\n"
+rev = "format_version \"2\"\n\nnew_manifest [0000000000000000000000000000000000000000]\n\nold_revision [" .. old_rev .. "]\n\nadd_file \"foo\"\n content [" .. file .. "]\n"
 check(mtn("automate", "put_revision", rev), 3, false, false)
 
 -- but this should work (tests that we can use put_revision to commit a
 -- single-parent revision)
 check(mtn("automate", "put_file", ""), 0, false, false)
-rev = "format_version \"1\"\n\nnew_manifest [0000000000000000000000000000000000000000]\n\nold_revision [4c2c1d846fa561601254200918fba1fd71e6795d]\n\patch \"foo\"\n from [5bf1fd927dfb8679496a2e6cf00cbe50c1c87145] to [da39a3ee5e6b4b0d3255bfef95601890afd80709]\n"
+rev = "format_version \"2\"\n\nnew_manifest [0000000000000000000000000000000000000000]\n\nold_revision [" .. old_rev .. "]\n\patch \"foo\"\n from [" .. file .. "] to [da39a3ee5e6b4b0d3255bfef95601890afd80709]\n"
 check(mtn("automate", "put_revision", rev), 0, false, false)
============================================================
--- tests/automate_show_conflicts/expected-attribute-attached.stdout	4ceb87a115b7810e89c6b39cf6564f3d64f4cc61
+++ tests/automate_show_conflicts/expected-attribute-attached.stdout	698b1ba6aaf59e81d64b5fe280ac192dfc7df088
@@ -1,6 +1,6 @@
-    left [febd58929375e5820fb73dd258d3f53d77014aa9]
-   right [feec4de91f4698bc77f1b50c82ee4513cc47ae8f]
-ancestor [c79cbcfb99f7a5e547815669b150dd3d9a28a598]
+    left [5193c0fb54afd1421e3833754b72fab9561f51de]
+   right [f1df6249dcc6c6b24d054e2a3ce5cf1aeac0a794]
+ancestor [a78b7743915a4e8d2cf4e10b56868f74b8363196]
 
         conflict attribute
        node_type "file"
============================================================
--- tests/automate_show_conflicts/expected-attribute-detached.stdout	40c709752502f9976b78f252e7bf7346e879255c
+++ tests/automate_show_conflicts/expected-attribute-detached.stdout	1f43caaa3ce4f9d271cff1d026b279ec17f27852
@@ -1,6 +1,6 @@
-    left [67ba83fd417fede6cb6de14d90783e93261e5210]
-   right [2654ad872bf18d40260aaf59e8ce0058bf54bddd]
-ancestor [d81bb87785fa1bbe11aed1ca6d3340d288b61b78]
+    left [55206f30701002c81011a9bbe2fc82599760d7ec]
+   right [c2413bdb69ae662dd56416fef9815647bd697113]
+ancestor [1977cea03814e36a3943144e4c4263959b7c2d54]
 
         conflict multiple_names
        left_type "renamed file"
============================================================
--- tests/automate_show_conflicts/expected-content-attached.stdout	6c39a0131b22693f4086fb68970e827a3241a287
+++ tests/automate_show_conflicts/expected-content-attached.stdout	7af6116b9dd5ff67c8aa327a2d4f576385e10fcc
@@ -1,6 +1,6 @@
-    left [0b9e5111f3e13ccb1727bc936aff962020dc9809]
-   right [49d6a10f5f09b064a35f1700966795ae698f0555]
-ancestor [7d854bf031420b7a5c1cafcb908f1020593196a8]
+    left [a35cfd5c26dafc1bc1c36409b44c577675046c3f]
+   right [ce46153d4284818a095254fbb5c3c5cfcf7efa3e]
+ancestor [f9d7c87814f908ce4535cb482578cb124f5e0014]
 
         conflict content
        node_type "file"
============================================================
--- tests/automate_show_conflicts/expected-content-detached.stdout	fb8495a17d8f6a59572cb87703c7f05af418b65d
+++ tests/automate_show_conflicts/expected-content-detached.stdout	b21ee9506b57fe1f45ef693a717e48df4de2d88a
@@ -1,6 +1,6 @@
-    left [7a4c8dae08866a0c65a5a136eeca82f85e028837]
-   right [40a6208fa7406a393823d33aecae509c80db37b4]
-ancestor [936159c798b9bb3f5d0f871a0dda158a844e9348]
+    left [f7ebe63f5c9e8167fa6369929141e90db6682f96]
+   right [709b59b1e40635a71c454e3c7b5be23bd7e42d29]
+ancestor [6789570c3bae6d6bf26f9d0b5973432467b1c535]
 
         conflict multiple_names
        left_type "renamed file"
============================================================
--- tests/automate_show_conflicts/expected-directory-loop.stdout	de5f4fbfee1d8fdafde73535041ddde66207eb2a
+++ tests/automate_show_conflicts/expected-directory-loop.stdout	3e7ce2152aebbfaded2d13e96a91c4be68e9e204
@@ -1,6 +1,6 @@
-    left [be04cb44902df12f3b36bf0efabba784547ccd34]
-   right [7cd48d9599eee2a67e8c510112659c0d313fb1df]
-ancestor [08ccbb14523a09d342568ce27a1b9f631d42aa9c]
+    left [462ad25d992005c4de7316833457cdd7dd187437]
+   right [b15471f54c7e154f8fc5f066a03b62d83b5860e9]
+ancestor [47001ee2df3dcb2d842ac12d4eff00601d6b246b]
 
      conflict directory_loop_created
     left_type "renamed directory"
============================================================
--- tests/automate_show_conflicts/expected-duplicate-add-rename.stdout	960c1810ffd09fb5fb6e7623dd5740c623d2e46a
+++ tests/automate_show_conflicts/expected-duplicate-add-rename.stdout	43b965b51e1ca0992c4ef67ed49d39aa522805f5
@@ -1,6 +1,6 @@
-    left [446ea80c3f78fca1cfdb84aad55939f4e635ddc0]
-   right [367cb265f641ead9834f497ff3cbcb2b85ffe1fa]
-ancestor [d9ff68aa530d581731b0e5739b3494963cd89e91]
+    left [8d0e5604b682548d80d1261d45c0d1977589ac52]
+   right [911263a1d2f927974e435d6e5f658533325ded87]
+ancestor [677b9f7d53aef1e2de0630bbe729a67dc97b43da]
 
         conflict duplicate_name
        left_type "renamed file"
============================================================
--- tests/automate_show_conflicts/expected-duplicate-adds.stdout	f62b2ef38c303a56d63f23849907a5e9a4c0af8c
+++ tests/automate_show_conflicts/expected-duplicate-adds.stdout	2483c221f8e64f1e16e898a325b4fc470d654ca9
@@ -1,6 +1,6 @@
-    left [36e62406e9792ad64f7af73c5192d2e4e53306c8]
-   right [2b96f8e6ed2bb566c22ebcbdd06d34d1043c237f]
-ancestor [56cafb3485be6d40923bacaddcd19cde63433028]
+    left [298472e3a30969d3091ca5d1884f586dbb779909]
+   right [e012baeb4f82b60b14d329b0aec96b6566b088ad]
+ancestor [1869286d3425bea226f20e12eae8c3a7ea4ca37e]
 
      conflict duplicate_name
     left_type "added file"
============================================================
--- tests/automate_show_conflicts/expected-duplicate-name-multiple-name-missing-root.stdout	97246345a094fdb4d824196a148ff03f163372fd
+++ tests/automate_show_conflicts/expected-duplicate-name-multiple-name-missing-root.stdout	61c40a5b51e5c47e6d46601a1d87a1361349812f
@@ -1,6 +1,6 @@
-    left [254fd127afd769a33979a843f5e3d8f2457097e6]
-   right [6e0b7ffd0171d72db85dfc54234a78a35dd76cf3]
-ancestor [5bc669f00cf90b76dd38077827565b624d823756]
+    left [22a78387206cd5c57c1928e6fa88a3ccd63482b3]
+   right [1cc80b23fa548415014fc90687c02d2bc3fa8e27]
+ancestor [344c8d50b9b63b2db7b4e18e3e32e4684df98f64]
 
      conflict missing_root
     left_type "pivoted root"
============================================================
--- tests/automate_show_conflicts/expected-duplicate-renames.stdout	fcefa7860a93fb5a21ea56045a22c1d7085702eb
+++ tests/automate_show_conflicts/expected-duplicate-renames.stdout	e8559ce823b3bc1000946c5b5ca977595acf93dc
@@ -1,6 +1,6 @@
-    left [1fc2275efef8645a25e267ae47686e57e50ca1e1]
-   right [497d6e99c8b79ef5848aa862154f496432f07709]
-ancestor [680280e4dcc9fcf60721e6ac9157d98ac5f94c37]
+    left [63fac254a956c387572b8f1fb4e51731e06ef614]
+   right [a67c1d9abb07e09d156bd45724d900a453d6a438]
+ancestor [e8c9467f4c4bd074a702109683e2616ab701d988]
 
         conflict duplicate_name
        left_type "renamed file"
============================================================
--- tests/automate_show_conflicts/expected-invalid-add.stdout	979bcb70f07c8c1bd1257abaac3ccc838685df16
+++ tests/automate_show_conflicts/expected-invalid-add.stdout	a98c53730bee539877d9884a5e6945080d0f0b1c
@@ -1,6 +1,6 @@
-    left [507f1209e78415722129e65633a8d6a9dd6003f1]
-   right [cdf9a4171d1d386f9ecb83218a11df6c5fa75c6c]
-ancestor [36e6935d3fddf349ef829125e8b6d41ea85d1db8]
+    left [4ad32f522fb68c7d76aa5ccbee88e397aacac4c9]
+   right [1490ed5ee6581b4c3b9184da9f0fb21b07f0f57d]
+ancestor [8a3e5908d62a8925532a5ed42466bc91e34fe946]
 
      conflict invalid_name
     left_type "pivoted root"
============================================================
--- tests/automate_show_conflicts/expected-invalid-rename.stdout	03f20ce606834c98052f061d9db45e98199e69e5
+++ tests/automate_show_conflicts/expected-invalid-rename.stdout	6933cc55f5559463645b9dd6e9b33f918f16feda
@@ -1,6 +1,6 @@
-    left [2bf9335ed387a7f1f082b0bc5ecdffa303d8393f]
-   right [459c32f4c7b4676d47e23aff2bd67c1e2eae5f09]
-ancestor [e7f711a68627ccae4aded5907fc80516ea1215fd]
+    left [a39f899f91f8380081ba00d8db9f600d16d94b33]
+   right [7c181e3572402e50da8b72a0f9468f9942bbf6e7]
+ancestor [3ef3f9e956c77cf9e34bf778f23d7d3fae3fb9db]
 
         conflict invalid_name
        left_type "pivoted root"
============================================================
--- tests/automate_show_conflicts/expected-missing-root.stdout	94b47debd3848a1369db6c4c45123448f34f5766
+++ tests/automate_show_conflicts/expected-missing-root.stdout	d6c6ff5112a437c06ef38aa05227d6d8832488a8
@@ -1,6 +1,6 @@
-    left [532ab5011ea9e64aa212d4ea52363b1b8133d5ba]
-   right [b94a03a922c2c281a88d8988db64e76a32edb6a1]
-ancestor [ead03530f5fefe50c9010157c42c0ebe18086559]
+    left [5a08a3786f1cc77ad00c0712bea9a6bc2e7c5d46]
+   right [0101af73841e442ae4c6ac98c452855264b201c3]
+ancestor [5b7664d7a65579420e59b06ca2150893a075a391]
 
      conflict missing_root
     left_type "pivoted root"
============================================================
--- tests/automate_show_conflicts/expected-multiple-name-plus-directory-loop.stdout	fb19db164690da0bfacc3023861bfbde3e0a6756
+++ tests/automate_show_conflicts/expected-multiple-name-plus-directory-loop.stdout	888489c3c464c01581aedf3e1c655e0c1e0ed33d
@@ -1,6 +1,6 @@
-    left [4e25e44deef167f640248e542916736b649e3044]
-   right [0b37ed4689ee191cdd4bd26e5233511329b17032]
-ancestor [27169065f28ccfb64678ac168b3805796bd9e5ae]
+    left [4eb82b9aaa40ecf438307d795bfaaeef66ee5ec6]
+   right [026290fb89cccda5ef49e77ca642b8f1f93cdc25]
+ancestor [eb7acc367bab144dcc5b599c01f77a908265011b]
 
      conflict multiple_names
     left_type "renamed directory"
============================================================
--- tests/automate_show_conflicts/expected-multiple-name-plus-duplicate-name.stdout	9fd3b1c4abfcf81218e7f1114cb110e9bdf63ab5
+++ tests/automate_show_conflicts/expected-multiple-name-plus-duplicate-name.stdout	aaf38f9f033c67c44f2b48cd0d5078247c161dc3
@@ -1,6 +1,6 @@
-    left [424a7237e21522fd09878f486acbb8807cae59e6]
-   right [ef9b007adf6e49cc6b7e5317d860fb5716f418e9]
-ancestor [621e8ed86b46adcc57cd6abec90ecc41481a3e3b]
+    left [ed75ad7763d3daf719c5dd9293c8faf02d3b028c]
+   right [80b25937a5e5990de0989d925f0d391c3f45f5bb]
+ancestor [5cb8b5c1004f75e23312344cc9f8c489fcbd3e87]
 
         conflict multiple_names
        left_type "renamed file"
============================================================
--- tests/automate_show_conflicts/expected-multiple-name-plus-orphan.stdout	11b1c86e6b665778c54def56ed4b25d9d2c672c2
+++ tests/automate_show_conflicts/expected-multiple-name-plus-orphan.stdout	8869c7e2fe4c6a21a354c14a4e3875f9cbf69999
@@ -1,6 +1,6 @@
-    left [0c9b6d79dc8842d0440be2b10a8bf4015d1114b9]
-   right [894db59b5fe6bcc4a22cfc1e06e5865b2bd888b1]
-ancestor [e487f26d5c464b381743e394923b7fd44b00705e]
+    left [e078bb3b3e5ba0be247ccf7b6b24fd66e4ae5a57]
+   right [9dd13ae1e43fda5c04d49ed18762137e66542a34]
+ancestor [132f4c90bd5ccb8fad382676d481f414a59034c8]
 
         conflict multiple_names
        left_type "renamed file"
============================================================
--- tests/automate_show_conflicts/expected-multiple-names.stdout	9cdc729aed940d5504888465e20bb4ca30f8d5ba
+++ tests/automate_show_conflicts/expected-multiple-names.stdout	56726a3e28c21f4e0cf58a55d56c08ad0e68fcd6
@@ -1,6 +1,6 @@
-    left [872b02c3aaa3b8ee6acf7e00e67108d5aaa8cb31]
-   right [bf62726ad7c36e553cb8906906866962786e52c0]
-ancestor [560b97068441495b17d8924f6122a1c47213a08b]
+    left [eb568bc80213750287dfad4b4eb871e3cd6a4b9d]
+   right [f22dcdccd2a1f9458e6c23ae8bdc44c62f076228]
+ancestor [38b32f0ae97a61771cd4ff936e79f330ce5d3f73]
 
         conflict multiple_names
        left_type "renamed file"
============================================================
--- tests/automate_show_conflicts/expected-orphaned-add.stdout	a935d1c389fa30701f15e2c01cd880ee3a1c8620
+++ tests/automate_show_conflicts/expected-orphaned-add.stdout	43a043caab61ec1a522918e8076dbf05f5cd13ee
@@ -1,6 +1,6 @@
-    left [140a1d712e5e7368dc88766144e0975746f27b9a]
-   right [872259407b5e1445c6b463768243ddaf531bd73a]
-ancestor [cce148761e33b0abbaa1c072ee913dcc23d7bfc3]
+    left [346bd924928d6db9baebc2be4cb2e321afef4c20]
+   right [8d4f4db6f65492aea3794506dd75d686b212b0b3]
+ancestor [92a81940172de7d170a2982af93ba795f28e2b6c]
 
      conflict orphaned_file
    right_type "deleted directory"
============================================================
--- tests/automate_show_conflicts/expected-orphaned-rename.stdout	6096fa729c8ef741b7a64a7405984f601906c5bb
+++ tests/automate_show_conflicts/expected-orphaned-rename.stdout	5c77ca680005b4094bcb18f635b93827da48bab0
@@ -1,6 +1,6 @@
-    left [4ceae2a74d9d0d7341d2cd01a71c9e84eb1fefa7]
-   right [16a19ace8ec26cd2ed13c7e727a3021e82a2204f]
-ancestor [b5f52dbc0dc530adffbdd140a7de5b129cf74f29]
+    left [2badba7afcd709c190d4203b954951a7fd7c6b20]
+   right [a757a3c19ce030fcdc9be0038307454ef7fd1ade]
+ancestor [d5a2d848824be04c11fc2408167ef980bdd0fa9f]
 
         conflict orphaned_file
       right_type "deleted directory"
============================================================
--- tests/automate_show_conflicts/expected-unrelated-projects.stdout	ee0741479e34ee1343e029dec1e206ca171716b4
+++ tests/automate_show_conflicts/expected-unrelated-projects.stdout	f0006a8503d9e919ac25d80711c96d4bd966bd15
@@ -1,5 +1,5 @@
-    left [161e426c3b0c3f98d0be225f69d6f893ce8e0442]
-   right [0e3260f51acd1e98c40666557eb6c0eefeae5f02]
+    left [a1414021bbe3928aa0c6608d395d125e96e11d07]
+   right [1050b997cebd63dc67dbbd535cd1c07b1e5c2900]
 ancestor []
 
 conflict missing_root
============================================================
--- tests/db_rosterify_preserves_renames/expout	879f84c3e8b6c3486afcc1ff58295d38984b9862
+++ tests/db_rosterify_preserves_renames/expout	bcd740b2f5519a893c5a6ade53a46e303499cecd
@@ -1,8 +1,8 @@
-format_version "1"
+format_version "2"
 
 new_manifest [0ee54a587bc4465f17eaf5de2807fbd7d9f46c75]
 
-old_revision [3ee4662e91afd842e0eb0e6681db790bf8c3e627]
+old_revision [66379f0924a543ad4660e1328c3dabf68f8a3ce0]
 
 rename "testdir_start"
     to "testdir_end"
============================================================
--- tests/diff_against_empty_file/expected.diff	4bd7f5ef4ef0e7ef33ee6995cb9b37e14385c918
+++ tests/diff_against_empty_file/expected.diff	1d9cfccf0f4b14458a9dc95ed163aedd41fcb9f7
@@ -1,5 +1,5 @@
 #
-# old_revision [010297e01bc32090e5a7de8f5bd1c4c69d72f532]
+# old_revision [8f57d6c713fc0373f6dac132df1f0ac6d6528b3e]
 #
 # patch "foo"
 #  from [83f5a5c359f3dc8317519240e32f1f51f68bc051]
============================================================
--- tests/diff_on_missing_trailing_newline_at_end_of_file/file13.diff	d6e7ac58324be3537427f865e5925f187331f5de
+++ tests/diff_on_missing_trailing_newline_at_end_of_file/file13.diff	e0510e6649983da53251c3331ba205fe5fcb2ec6
@@ -1,5 +1,5 @@
 #
-# old_revision [40ea110392539e19c2d251569a3610c0051e0c64]
+# old_revision [3189858dee662e616a3978601d74269683a55f48]
 #
 # patch "file1"
 #  from [a43dc27b1c92cccc533ceb3a27035128e26e5b07]
============================================================
--- tests/diff_on_missing_trailing_newline_at_end_of_file/file14.diff	dcdd2294fa92ad013ddc177c12f3a3bed0c2dd38
+++ tests/diff_on_missing_trailing_newline_at_end_of_file/file14.diff	3bd09e03e483fb149dde741e056670e4cf9a8a40
@@ -1,5 +1,5 @@
 #
-# old_revision [40ea110392539e19c2d251569a3610c0051e0c64]
+# old_revision [3189858dee662e616a3978601d74269683a55f48]
 #
 # patch "file1"
 #  from [a43dc27b1c92cccc533ceb3a27035128e26e5b07]
============================================================
--- tests/diff_on_missing_trailing_newline_at_end_of_file/file23.diff	86af946a84931611d6625fe4b555ab42b4e8fc0d
+++ tests/diff_on_missing_trailing_newline_at_end_of_file/file23.diff	0a6f095a2610813a341f9de3a269c0a2f8bedf5a
@@ -1,5 +1,5 @@
 #
-# old_revision [40ea110392539e19c2d251569a3610c0051e0c64]
+# old_revision [3189858dee662e616a3978601d74269683a55f48]
 #
 # patch "file2"
 #  from [4f8091d2fa31b0598dd0ff6dc936f8d0b47b59d1]
============================================================
--- tests/diff_on_missing_trailing_newline_at_end_of_file/file24.diff	e6c588f9eac350fac803802708a65f2807b68673
+++ tests/diff_on_missing_trailing_newline_at_end_of_file/file24.diff	b11710b5185e8ddc5a0ee1019e7f0fc778db344f
@@ -1,5 +1,5 @@
 #
-# old_revision [40ea110392539e19c2d251569a3610c0051e0c64]
+# old_revision [3189858dee662e616a3978601d74269683a55f48]
 #
 # patch "file2"
 #  from [4f8091d2fa31b0598dd0ff6dc936f8d0b47b59d1]
============================================================
--- tests/exchanging_work_via_netsync,_with_notes/testnotes.test	7a9f14e9a6567c37da8eadd1e23f383bb5632072
+++ tests/exchanging_work_via_netsync,_with_notes/testnotes.test	de6bd24f0872552159110be808cdb8c6d6d76639
@@ -1,10 +1,10 @@ revision: new_id    = REV1
 start ---------------------------------------------------
 start: sync_type = pull
 start: remote_keyname = address@hidden
 start: includes = testbranch
 start: excludes = 
 revision: new_id    = REV1
-revision: revision  = format_version "1"
+revision: revision  = format_version "2"
 
 new_manifest [MAN1]
 
@@ -29,7 +29,7 @@ revision: new_id    = REV2
 revision: cert.value = DATE1
 revision: cert.key   = address@hidden
 revision: new_id    = REV2
-revision: revision  = format_version "1"
+revision: revision  = format_version "2"
 
 new_manifest [MAN2]
 
============================================================
--- tests/importing_cvs_tricky_repo_with_tags/test.tags	3dc70bde8e7a37132a0b98638a32be4494477832
+++ tests/importing_cvs_tricky_repo_with_tags/test.tags	0907dd3e5bcfe22929186989060e21f8604a163f
@@ -1,3 +1,3 @@
-initial 7be6a094cb29307bed5bbacf40b3f3642222f413 address@hidden
-portable-branch-base 32ba3f451dcf277762ca1c328043df2e2ceebc17 address@hidden
-portable-branch-fork-20050601T0139 32ba3f451dcf277762ca1c328043df2e2ceebc17 address@hidden
+initial 59d3494785ee977cd9ca87f0948f29a9caeab040 address@hidden
+portable-branch-base 32edff3da51d487ae1ceb6e20b15a6ff5d87d0e1 address@hidden
+portable-branch-fork-20050601T0139 32edff3da51d487ae1ceb6e20b15a6ff5d87d0e1 address@hidden
============================================================
--- tests/merge_into_workspace/__driver__.lua	eff4b2a9a9871f5086b302176397d983e6590c54
+++ tests/merge_into_workspace/__driver__.lua	09a11a18dfe2e40b8ecfbd610883ac6db35eca36
@@ -74,7 +74,7 @@ check(mtn("automate", "get_current_revis
 
 -- some automate commands that should do sensible things
 check(mtn("automate", "get_current_revision_id"), 0,
-      "5e009ca0dc972a9b09a7fbfb647908bee07fb562\n", nil)
+      "1b69788211c0be7dfae027b9725fba5bbb3d9295\n", nil)
 
 check(get("expected-manifest"))
 check(mtn("automate", "get_manifest_of"), 0, {"expected-manifest"}, nil)
============================================================
--- tests/merge_into_workspace/expected-log	77915a878636ca16ee32f5385d88a7dc8bd0054a
+++ tests/merge_into_workspace/expected-log	4587aba962a1e7fce1ab7939f2f29a5b28358645
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------
-Revision: 04093de26437e634d2b43f1722e22fcc6b3804c3
-Ancestor: 87c726bb950efb3d809662b86700a8566346970d
+Revision: 1512db0a051e555945963945918b8a5ad0dca351
+Ancestor: ef06a3f37989a45c2417ef3c73ab759b126ffcf9
 Author: address@hidden
 Date: 2007-02-28T02:09:14
 Branch: testbranch
@@ -13,8 +13,8 @@ blah-blah
 blah-blah
 
 -----------------------------------------------------------------
-Revision: 21320a960288df775cd62b01f1b40e981f4ecd65
-Ancestor: 87c726bb950efb3d809662b86700a8566346970d
+Revision: d32d2af2d1af4c0c7ecc22fcd13f8e04b48b58a4
+Ancestor: ef06a3f37989a45c2417ef3c73ab759b126ffcf9
 Author: address@hidden
 Date: 2007-02-28T02:09:13
 Branch: testbranch
@@ -27,7 +27,7 @@ blah-blah
 blah-blah
 
 -----------------------------------------------------------------
-Revision: 87c726bb950efb3d809662b86700a8566346970d
+Revision: ef06a3f37989a45c2417ef3c73ab759b126ffcf9
 Ancestor: 
 Author: address@hidden
 Date: 2007-02-28T02:09:12
============================================================
--- tests/merge_into_workspace/expected-log-left	6f396f4e143f0b58ef18131c13549622eea39cfb
+++ tests/merge_into_workspace/expected-log-left	e8469bbb7f572a5f010e2fe68d767de318d8ac33
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------
-Revision: 21320a960288df775cd62b01f1b40e981f4ecd65
-Ancestor: 87c726bb950efb3d809662b86700a8566346970d
+Revision: d32d2af2d1af4c0c7ecc22fcd13f8e04b48b58a4
+Ancestor: ef06a3f37989a45c2417ef3c73ab759b126ffcf9
 Author: address@hidden
 Date: 2007-02-28T02:11:20
 Branch: testbranch
@@ -13,7 +13,7 @@ blah-blah
 blah-blah
 
 -----------------------------------------------------------------
-Revision: 87c726bb950efb3d809662b86700a8566346970d
+Revision: ef06a3f37989a45c2417ef3c73ab759b126ffcf9
 Ancestor: 
 Author: address@hidden
 Date: 2007-02-28T02:11:19
============================================================
--- tests/merge_into_workspace_attr_corpse/expected-roster	ec6ec9f4baf4b624a31910544eada0aaae4ff5e2
+++ tests/merge_into_workspace_attr_corpse/expected-roster	449189ed40b89ff5992c371781a375efa5bd5514
@@ -1,17 +1,17 @@ format_version "1"
 format_version "1"
 
       dir ""
     ident "1"
-    birth [e032edcb78885de86a3a3a05f641ae1d25f63988]
-path_mark [e032edcb78885de86a3a3a05f641ae1d25f63988]
+    birth [2a7950ecd37086d555262996b8bdc5074b6f505f]
+path_mark [2a7950ecd37086d555262996b8bdc5074b6f505f]
 
         file "testfile"
      content [c537e8ec248c6cd32e54cd6fa98ae15743f996b4]
        ident "2"
 dormant_attr "left-attr"
 dormant_attr "right-attr"
+       birth [2a7950ecd37086d555262996b8bdc5074b6f505f]
+   path_mark [2a7950ecd37086d555262996b8bdc5074b6f505f]
+content_mark [2a7950ecd37086d555262996b8bdc5074b6f505f]
+   attr_mark "left-attr" [33d6c90b1475bbf53161fc0922d983e9e91727a1]
+   attr_mark "right-attr" [2ec0982f0b748106a7040a4fe33b3dcf96337e47]
-       birth [e032edcb78885de86a3a3a05f641ae1d25f63988]
-   path_mark [e032edcb78885de86a3a3a05f641ae1d25f63988]
-content_mark [e032edcb78885de86a3a3a05f641ae1d25f63988]
-   attr_mark "left-attr" [fd014440f510fde3f7d8093c03ee510fb2781694]
-   attr_mark "right-attr" [7dcdf53649d29ab55ca7f400b12771ffa3493702]
============================================================
--- tests/merge_into_workspace_files_added/expected-revision	8c8848dd89bc0626bb099b7d1128fc93cdb5d78e
+++ tests/merge_into_workspace_files_added/expected-revision	54ce771fef19632232dd85c005ed49e1053d37d0
@@ -1,13 +1,13 @@
-format_version "1"
+format_version "2"
 
 new_manifest [1ad9c86d349f3f4af96ddd1147f6da0e3d52a234]
 
-old_revision [a140446fe05fa24bd367c57ea9b572dc264188cb]
+old_revision [a12da14ceeec3d12b319293f8f51d13bf4576bcf]
 
 add_file "left"
  content [0ffe36a4ca2169de7543a67f92134ea93636b246]
 
-old_revision [c77393b91d1abd3f4306465ca468b2f87494c910]
+old_revision [fa43d6e6d469b94e30d34b632e2095c901f6203b]
 
 add_file "right"
  content [7478fc33b2476515959ea9be9306295a36a22d64]
============================================================
--- tests/merge_multiple_heads_1/__driver__.lua	bebbc7168575bafba8c3ef75f2e4a1f564b5d80a
+++ tests/merge_multiple_heads_1/__driver__.lua	24578fdabe586f3691c3a24483c31c65bd65ac73
@@ -25,9 +25,13 @@ grandparent = base_revision()
 -- Check in ce first so that the old dumb "in whatever order
 -- get_branch_heads returns" algorithm will do it wrong.
 
-writefile_q("file", C("ce"))
+-- File contents are picked empirically to get the revid order checked
+-- below, and also to let the final merge succeed.
+
+writefile_q("file", C("ceee"))
 commit()
 ce_rev = base_revision()
+writefile("ce_rev", ce_rev)
 
 revert_to(grandparent)
 writefile_q("file", C("xx"))
@@ -37,11 +41,13 @@ cx_rev = base_revision()
 writefile_q("file", C("cx"))
 commit()
 cx_rev = base_revision()
+writefile("cx_rev", cx_rev)
 
 revert_to(parent)
-writefile_q("file", C("xe"))
+writefile_q("file", C("xeee"))
 commit()
 xe_rev = base_revision()
+writefile("xe_rev", xe_rev)
 
 -- Double-check that the old dumb "in lexicographic order by revision_id"
 -- algorithm would get this wrong.
============================================================
--- tests/merge_update_part_of_file/before.diff	1f6b25391440c416b57b517d8ce552d7b7a52f80
+++ tests/merge_update_part_of_file/before.diff	3baa9f63ec6c1a6be93c39fb5c2f8e661fe745e8
@@ -1,5 +1,5 @@
 #
-# old_revision [b73a4e885d20f1b7e6e4e4898b4be74180ba62e3]
+# old_revision [3e2edb3c0544586913667695fe397d29d9bcc0c1]
 #
 # patch "testfile"
 #  from [d398dd22a6c828326c2e0777d412aee0e9ddf4e7]
============================================================
--- tests/merge_with_conflicting_name_and_renamed_dir/expected.stdout	2e696c102e7388389e5117fd0cba1e736bef7ee3
+++ tests/merge_with_conflicting_name_and_renamed_dir/expected.stdout	0ef8a2df21240536b648ae7ee4bf79b3b2248d60
@@ -1,6 +1,6 @@
-    left [3e5ae9c2084d1ab530cd9690bac5e45ee6db7ade]
-   right [e7d401d9de91696feaf17569337d10ed6e02a9b5]
-ancestor [51ccdc67277ec1461e1140df66fd00d56db3e7b5]
+    left [8395803a177ddec8e34a3115017e6a2e2c3db1ad]
+   right [ada52b5ebe1a53fb0d72b94059293f2d216ba97b]
+ancestor [e7e993e78373c58b3b7bcc032a6383bfc1310a88]
 
      conflict duplicate_name
     left_type "added file"
============================================================
--- tests/rosterify_on_a_db_with_an_empty_manifest/revision_good	8b182249d66c7d6e0c8a04eb5de1227cdece8a1e
+++ tests/rosterify_on_a_db_with_an_empty_manifest/revision_good	f44f1bfe87e1cafb55c4fcca675a03d80d221cee
@@ -1,7 +1,7 @@
-format_version "1"
+format_version "2"
 
 new_manifest [ec9ef3a345b0766c1e03c47c1e22b1fe174395e7]
 
-old_revision [9a0e6637605966d7a125f7c8932bed02ee930207]
+old_revision [f4b3c3f073e11a24733767e9f5b7d68cf4e486f5]
 
 delete "afile"